Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ jobs:
- uses: actions/setup-python@v2
- name: Linting
run: |
pip install check-manifest mypy
check-manifest
pip install Flake8-pyproject mypy
mypy jupyter_console
flake8 jupyter_console

check_release:
runs-on: ubuntu-latest
Expand All @@ -65,7 +65,7 @@ jobs:
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1

test_minimum_verisons:
test_minimum_versions:
name: Test Minimum Versions
runs-on: ubuntu-latest
timeout-minutes: 10
Expand All @@ -78,3 +78,18 @@ jobs:
run: |
pip install ".[test]"
pytest || pytest --lf

tests_check: # This job does nothing and is only used for the branch protection
if: always()
needs:
- build
- lint
- check_release
- check_links
- test_minimum_versions
runs-on: ubuntu-latest
steps:
- name: Decide whether the needed jobs succeeded or failed
uses: re-actors/alls-green@release/v1
with:
jobs: ${{ toJSON(needs) }}
File renamed without changes.
29 changes: 0 additions & 29 deletions MANIFEST.in

This file was deleted.

6 changes: 3 additions & 3 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ 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 hatch twine`

### Bump version

- `export version=<NEW_VERSION>`
- `tbump ${version} --no-push`
- `hatch version ${version}`

### Push to GitHub

Expand All @@ -27,6 +27,6 @@ git push upstream && git push upstream --tags
```bash
rm -rf dist/*
rm -rf build/*
python -m build .
hatch build .
twine upload dist/*
```
2 changes: 1 addition & 1 deletion jupyter_console/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Jupyter terminal console"""

from ._version import version_info, __version__
from ._version import version_info, __version__ # noqa
2 changes: 1 addition & 1 deletion jupyter_console/tests/test_console.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from traitlets.tests.utils import check_help_all_output


should_skip = sys.platform == "win32" or sys.version_info < (3,8) or sys.version_info[:2] == (3, 10)
should_skip = sys.platform == "win32" or sys.version_info < (3,8) or sys.version_info[:2] == (3, 10) # noqa


@flaky
Expand Down
84 changes: 68 additions & 16 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,23 +1,75 @@
[build-system]
requires = ["setuptools>=40.8.0", "wheel"]
build-backend = "setuptools.build_meta"
requires = ["hatchling>=1.5"]
build-backend = "hatchling.build"

[project]
name = "jupyter-console"
dynamic = ["version"]
description = "Jupyter terminal console"
readme = "README.md"
license = { file= "LICENSE" }
requires-python = ">=3.7"
authors = [
{ name = "Jupyter Development Team", email = "[email protected]" },
]
keywords = [
"Interactive",
"Interpreter",
"Shell",
"Web",
]
classifiers = [
"Intended Audience :: Developers",
"Intended Audience :: Science/Research",
"Intended Audience :: System Administrators",
"License :: OSI Approved :: BSD License",
"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",
"Programming Language :: Python :: 3.11",
]
dependencies = [
"ipykernel>=6.14",
"ipython",
"jupyter_client>=7.0.0",
"jupyter_core>=4.12,!=5.0.*",
"prompt_toolkit>=3.0.30",
"pygments",
"pyzmq>=17",
"traitlets>=5.4",
]

[project.optional-dependencies]
test = [
"pexpect",
"pytest",
"flaky",
]

[project.scripts]
jupyter-console = "jupyter_console.app:main"

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

[tool.hatch.version]
path = "jupyter_console/_version.py"

[tool.hatch.build.targets.sdist]
include = [
"/jupyter_console",
]

[tool.jupyter-releaser]
skip = ["check-links"]

[tool.check-manifest]
ignore = [".mailmap", "*.yml", "*.yaml"]

[tool.tbump.version]
current = "6.5.1"
regex = '''
(?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)
((?P<channel>a|b|rc|.dev)(?P<release>\d+))?
'''
[tool.pytest.ini_options]
addopts = "--durations=10"

[tool.tbump.git]
message_template = "Bump to {new_version}"
tag_template = "v{new_version}"
[tool.flake8]
max-line-length = "99"
ignore = "W291, E266, E265, E128, E251, E402, E124, E302, W293, E231, E222, W503, E126, E121, W391, E226, E127, W504"

[[tool.tbump.file]]
src = "jupyter_console/_version.py"
2 changes: 0 additions & 2 deletions pytest.ini

This file was deleted.

8 changes: 0 additions & 8 deletions setup.cfg

This file was deleted.

74 changes: 0 additions & 74 deletions setup.py

This file was deleted.