Skip to content

Commit 04ee520

Browse files
authored
Merge pull request #24 from blink1073/use-flit
2 parents 6e480ed + 8ed3dce commit 04ee520

File tree

9 files changed

+79
-109
lines changed

9 files changed

+79
-109
lines changed

.flake8

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
[flake8]
2+
ignore = E501, W503, E402
3+
builtins = c, get_config
4+
exclude =
5+
.cache,
6+
.github,
7+
docs,
8+
setup.py
9+
enable-extensions = G
10+
extend-ignore =
11+
G001, G002, G004, G200, G201, G202,
12+
# black adds spaces around ':'
13+
E203,
14+
per-file-ignores =
15+
# B011: Do not call assert False since python -O removes these calls
16+
# F841 local variable 'foo' is assigned to but never used
17+
tests/*: B011, F841

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,5 @@ jobs:
126126
steps:
127127
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
128128
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1
129+
with:
130+
extra_test: 'jupyter server extension list 2>&1 | grep -ie "jupyter_server_terminals.*OK"'

CONTRIBUTING.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The development version of the server requires `node <https://nodejs.org/en/down
2424
Once you have installed the dependencies mentioned above, use the following
2525
steps::
2626

27-
pip install --upgrade setuptools pip
27+
pip install --upgrade pip
2828
git clone https://github.com/jupyter/jupyter_server_terminals
2929
cd jupyter_server_terminals
3030
pip install -e .

MANIFEST.in

Lines changed: 0 additions & 35 deletions
This file was deleted.

jupyter_server_terminals/__init__.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
from .app import TerminalsExtensionApp
1+
from ._version import __version__ # noqa:F401
2+
3+
try:
4+
from .app import TerminalsExtensionApp
5+
except ModuleNotFoundError:
6+
import warnings
7+
8+
warnings.warn("Could not import submodules")
29

310

411
def _jupyter_server_extension_points(): # pragma: no cover

pyproject.toml

Lines changed: 51 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,56 @@
11
[build-system]
2-
requires = ["jupyter_packaging~=0.9", "jupyter_server"]
3-
build-backend = "jupyter_packaging.build_api"
2+
requires = ["flit_core >=3.2,<4"]
3+
build-backend = "flit_core.buildapi"
44

5-
[tool.check-manifest]
6-
ignore = [""]
5+
[project]
6+
name = "jupyter_server_terminals"
7+
license = { file = "LICENSE" }
8+
description = "A Jupyter Server Extension Providing Terminals."
9+
keywords = ["ipython", "jupyter"]
10+
classifiers = [
11+
"Intended Audience :: Developers",
12+
"Intended Audience :: System Administrators",
13+
"Intended Audience :: Science/Research",
14+
"License :: OSI Approved :: BSD License",
15+
"Programming Language :: Python",
16+
"Programming Language :: Python :: 3.7",
17+
"Programming Language :: Python :: 3.8",
18+
"Programming Language :: Python :: 3.9",
19+
"Programming Language :: Python :: 3.10"
20+
]
21+
requires-python = ">=3.7"
22+
dependencies = [
23+
"pywinpty>=2.0.3;os_name=='nt'",
24+
"terminado>=0.8.3",
25+
]
26+
dynamic = ["version"]
27+
28+
[[project.authors]]
29+
name = "Jupyter Development Team"
30+
31+
32+
[project.readme]
33+
file = "README.md"
34+
content-type = "text/markdown"
35+
36+
[project.urls]
37+
Homepage = "https://jupyter.org"
38+
39+
[project.optional-dependencies]
40+
test = [
41+
"coverage",
42+
"jupyter_server[test] @ git+https://github.com/jupyter-server/jupyter_server.git@main",
43+
"pytest>=6.0",
44+
"pytest_tornasync",
45+
"pytest-cov",
46+
"pytest-timeout",
47+
]
48+
49+
[tool.flit.external-data]
50+
directory = "jupyter-config"
51+
52+
[tool.flit.sdist]
53+
include = ["tests/"]
754

855
[tool.pytest.ini_options]
956
addopts = "-raXs --durations 10 --color=yes --doctest-modules"

setup.cfg

Lines changed: 0 additions & 65 deletions
This file was deleted.

setup.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)