Skip to content

Commit

Permalink
Merge pull request #781 from blink1073/use-flit
Browse files Browse the repository at this point in the history
  • Loading branch information
blink1073 authored May 9, 2022
2 parents 8e7a274 + 244ecce commit d2784ad
Show file tree
Hide file tree
Showing 11 changed files with 96 additions and 140 deletions.
4 changes: 0 additions & 4 deletions setup.cfg → .flake8
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,3 @@ per-file-ignores =
# F841 local variable 'foo' is assigned to but never used
# B007 Loop control variable
jupyter_client/tests/*: B011, F841, B007

[metadata]
name = jupyter_client
version = attr: jupyter_client._version.__version__
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ jobs:

- name: Build the docs
run: |
pip install -r requirements-doc.txt
pip install .
pip install ".[doc]"
cd docs
make html SPHINXOPTS="-W"
Expand Down
23 changes: 0 additions & 23 deletions MANIFEST.in

This file was deleted.

2 changes: 1 addition & 1 deletion RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The recommended way to make a release is to use [`jupyter_releaser`](https://git
### Prerequisites

- First check that the CHANGELOG.md is up to date for the next release version
- Install packaging requirements: `pip install tbump build tomlkit==0.7.0`
- Install packaging requirements: `pip install jupyter_releaser`

### Bump version

Expand Down
30 changes: 18 additions & 12 deletions jupyter_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,21 @@
from ._version import protocol_version # noqa
from ._version import protocol_version_info # noqa
from ._version import version_info # noqa
from .asynchronous import AsyncKernelClient # noqa
from .blocking import BlockingKernelClient # noqa
from .client import KernelClient # noqa
from .connect import * # noqa
from .launcher import * # noqa
from .manager import AsyncKernelManager # noqa
from .manager import KernelManager # noqa
from .manager import run_kernel # noqa
from .multikernelmanager import AsyncMultiKernelManager # noqa
from .multikernelmanager import MultiKernelManager # noqa
from .provisioning import KernelProvisionerBase # noqa
from .provisioning import LocalProvisioner # noqa

try:
from .asynchronous import AsyncKernelClient # noqa
from .blocking import BlockingKernelClient # noqa
from .client import KernelClient # noqa
from .connect import * # noqa
from .launcher import * # noqa
from .manager import AsyncKernelManager # noqa
from .manager import KernelManager # noqa
from .manager import run_kernel # noqa
from .multikernelmanager import AsyncMultiKernelManager # noqa
from .multikernelmanager import MultiKernelManager # noqa
from .provisioning import KernelProvisionerBase # noqa
from .provisioning import LocalProvisioner # noqa
except ModuleNotFoundError:
import warnings

warnings.warn("Could not import submodules")
75 changes: 75 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,78 @@
[build-system]
requires = ["flit_core >=3.2,<4"]
build-backend = "flit_core.buildapi"

[project]
name = "jupyter_client"
description = "Jupyter protocol implementation and client libraries"
keywords = [ "Interactive", "Interpreter", "Shell", "Web",]
classifiers = [
"Framework :: Jupyter",
"Intended Audience :: Developers",
"Intended Audience :: Education",
"Intended Audience :: System Administrators",
"Intended Audience :: Science/Research",
"License :: OSI Approved :: BSD License",
"Operating System :: OS Independent",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
]
requires-python = ">=3.7"
dependencies = [
"entrypoints",
"jupyter_core>=4.9.2",
"nest-asyncio>=1.5.4",
"python-dateutil>=2.8.2",
"pyzmq>=22.3",
"tornado>=6.0",
"traitlets",
]
dynamic = [ "version",]

[[project.authors]]
name = "Jupyter Development Team"
email = "jupyter@googlegroups.com"

[project.readme]
file = "README.md"
content-type = "text/markdown"

[project.license]
file = "COPYING.md"

[project.urls]
Homepage = "https://jupyter.org"

[project.optional-dependencies]
test = [
"codecov",
"coverage",
"ipykernel>=6.5",
"ipython",
"mypy",
"pre-commit",
"pytest",
"pytest-asyncio>=0.18",
"pytest-cov",
"pytest-timeout",
]
doc = [
"ipykernel",
"myst-parser",
"sphinx>=1.3.6",
"sphinx_rtd_theme",
"sphinxcontrib_github_alt",
]

[project.scripts]
jupyter-kernelspec = "jupyter_client.kernelspecapp:KernelSpecApp.launch_instance"
jupyter-run = "jupyter_client.runapp:RunApp.launch_instance"
jupyter-kernel = "jupyter_client.kernelapp:main"

[tool.black]
line-length = 100
skip-string-normalization = true
Expand Down
4 changes: 1 addition & 3 deletions readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ sphinx:
python:
version: 3.7
install:
# install docs requirements
- requirements: requirements-doc.txt
# install jupyter-client itself
- method: pip
path: .
path: ".[doc]"
5 changes: 0 additions & 5 deletions requirements-doc.txt

This file was deleted.

10 changes: 0 additions & 10 deletions requirements-test.txt

This file was deleted.

7 changes: 0 additions & 7 deletions requirements.txt

This file was deleted.

73 changes: 0 additions & 73 deletions setup.py

This file was deleted.

0 comments on commit d2784ad

Please sign in to comment.