Skip to content

Commit a886601

Browse files
committed
Prepare for use with Jupyter Releaser
1 parent 5238ddb commit a886601

File tree

14 files changed

+202
-150
lines changed

14 files changed

+202
-150
lines changed

.bumpversion.cfg

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

.github/workflows/check-release.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: Check Release
2+
on:
3+
push:
4+
branches: ["main"]
5+
pull_request:
6+
branches: ["*"]
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
check_release:
13+
runs-on: ubuntu-latest
14+
strategy:
15+
matrix:
16+
group: [check_release, link_check]
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v2
20+
- name: Install Python
21+
uses: actions/setup-python@v2
22+
with:
23+
python-version: 3.9
24+
architecture: "x64"
25+
- name: Install node
26+
uses: actions/setup-node@v2
27+
with:
28+
node-version: "14.x"
29+
- name: Get pip cache dir
30+
id: pip-cache
31+
run: |
32+
echo "::set-output name=dir::$(pip cache dir)"
33+
- name: Cache pip
34+
uses: actions/cache@v1
35+
with:
36+
path: ${{ steps.pip-cache.outputs.dir }}
37+
key: ${{ runner.os }}-pip-${{ hashFiles('setup.cfg') }}
38+
restore-keys: |
39+
${{ runner.os }}-pip-
40+
${{ runner.os }}-pip-
41+
- name: Cache checked links
42+
if: ${{ matrix.group == 'link_check' }}
43+
uses: actions/cache@v2
44+
with:
45+
path: ~/.cache/pytest-link-check
46+
key: ${{ runner.os }}-linkcheck-${{ hashFiles('**/*.md', '**/*.rst') }}-md-links
47+
restore-keys: |
48+
${{ runner.os }}-linkcheck-
49+
- name: Upgrade packaging dependencies
50+
run: |
51+
pip install --upgrade pip setuptools wheel --user
52+
- name: Install Dependencies
53+
run: |
54+
pip install -e .
55+
- name: Check Release
56+
if: ${{ matrix.group == 'check_release' }}
57+
uses: jupyter-server/jupyter_releaser/.github/actions/check-release@v1
58+
with:
59+
token: ${{ secrets.GITHUB_TOKEN }}
60+
- name: Check Links
61+
if: ${{ matrix.group == 'link_check' }}
62+
uses: jupyter-server/jupyter_releaser/.github/actions/check-links@v1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ dist
44
_build
55
docs/gh-pages
66
docs/config_options.rst
7+
docs/changelog.md
78
*.py[co]
89
__pycache__
910
*.egg-info

CHANGELOG.md

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# Changes in Jupyter Console {#changelog}
2+
3+
<!-- <START NEW CHANGELOG ENTRY> -->
4+
5+
## 6.4.0
6+
7+
<!-- <END NEW CHANGELOG ENTRY> -->
8+
9+
## 5.3.0
10+
11+
- Highlight matching parentheses [#147](https://github.com/jupyter/jupyter_console/pull/147)
12+
- The config option `JupyterConsoleApp.confirm_exit` replaces `ZMQTerminalInteractiveShell.confirm_exit`, to avoid redundancy [#141](https://github.com/jupyter/jupyter_console/pull/141)
13+
14+
## 5.2
15+
16+
- When using a kernel that the console did not start, exiting with Ctrl-D now leaves it running [#127](https://github.com/jupyter/jupyter_console/pull/127)
17+
- Added Ctrl-\\ shortcut to quit the console [#130](https://github.com/jupyter/jupyter_console/pull/130)
18+
- Input prompt numbers are now updated when another frontend has executed code in the same kernel [#119](https://github.com/jupyter/jupyter_console/pull/119)
19+
- Fix setting next input with newer versions of prompt_toolkit [#123](https://github.com/jupyter/jupyter_console/pull/123)
20+
- Ensure history entries are unicode, not bytes, on Python 2 [#122](https://github.com/jupyter/jupyter_console/pull/122)
21+
22+
## 5.1
23+
24+
- New `ZMQTerminalInteractiveShell.true_color` config option to use 24-bit colour
25+
- New `ZMQTerminalInteractiveShell.confirm_exit` config option to turn off asking 'are you sure' on exit
26+
- New `--simple-prompt` flag to explicitly use the fallback mode without prompt_toolkit
27+
- Fixed executing an empty input
28+
- Fixed formatting for code and outputs from other frontends executing code
29+
- Avoid using functions which will be removed in IPython 6
30+
31+
## 5.0
32+
33+
## 5.0.0
34+
35+
### Interactive Shell architecture
36+
37+
- Disinherit shell class from IPython Interactive Shell. This separates jupyter_console's `ZMQTerminalInteractiveShell` from IPython's `TerminalInteractiveShell` and `InteractiveShell` classes [#68](https://github.com/jupyter/jupyter_console/pull/68)
38+
- Update SIGINT handler to not use the old interactive API shell [#80](https://github.com/jupyter/jupyter_console/pull/80)
39+
40+
### Image Handling improvement
41+
42+
- use PIL as default image handler [#79](https://github.com/jupyter/jupyter_console/pull/79)
43+
- better indication of whether image data was handled [#77](https://github.com/jupyter/jupyter_console/pull/77)
44+
45+
### Prompts improvement
46+
47+
- use prompt_toolkit 1.0 [#74](https://github.com/jupyter/jupyter_console/pull/74)
48+
- don't use prompt_manager [#75](https://github.com/jupyter/jupyter_console/pull/75)
49+
- remove `colors_force` flag that have no effects [#88](https://github.com/jupyter/jupyter_console/pull/88)
50+
51+
## 4.1
52+
53+
## 4.1.1
54+
55+
- fix for readline history
56+
- don't confuse sys.path with virtualenvs
57+
58+
## 4.1.0
59+
60+
- readline/completion fixes
61+
- use is_complete messages to determine if input is complete (important for non-Python kernels)
62+
- fix: 4.0 was looking for jupyter_console_config in IPython config directories, not Jupyter
63+
64+
65+
## 4.0
66+
67+
## 4.0.3
68+
69+
- fix `jupyter console --generate-config`
70+
71+
## 4.0.2
72+
73+
- setuptools fixes for Windows
74+
75+
## 4.0.0
76+
77+
- First release as a standalone package.

COPYING.md renamed to LICENSE

File renamed without changes.

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ global-exclude .ipynb_checkpoints
2424

2525
include *.md
2626
include *.yml
27-
include .bumpversion.cfg
2827
include mypy.ini
2928
include pytest.ini
3029
include .mailmap

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ $ python -m pep517.build .
4343

4444
## Resources
4545
- [Project Jupyter website](https://jupyter.org)
46-
- [Documentation for Jupyter Console](https://jupyter-console.readthedocs.io/en/latest/) [[PDF](https://media.readthedocs.org/pdf/jupyter-console/latest/jupyter-notebook.pdf)]
46+
- [Documentation for Jupyter Console](https://jupyter-console.readthedocs.io/en/latest/) [[PDF](https://media.readthedocs.org/pdf/jupyter-console/latest/jupyter-console.pdf)]
4747
- [Documentation for Project Jupyter](https://jupyter.readthedocs.io/en/latest/index.html) [[PDF](https://media.readthedocs.org/pdf/jupyter/latest/jupyter.pdf)]
4848
- [Issues](https://github.com/jupyter/jupyter_console/issues)
4949
- [Technical support - Jupyter Google Group](https://groups.google.com/forum/#!forum/jupyter)

RELEASING.md

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,32 @@
11
# Releasing
22

3-
## Prerequisites
3+
## Using `jupyter_releaser`
44

5-
- Install `bump2version`
6-
- Install `twine`
5+
The recommended way to make a release is to use [`jupyter_releaser`](https://github.com/jupyter-server/jupyter_releaser#checklist-for-adoption).
76

8-
## Push to GitHub
7+
## Manual Release
98

10-
Change from patch to minor or major for appropriate version updates.
9+
### Prerequisites
10+
11+
- First check that the CHANGELOG.md is up to date for the next release version
12+
- Install packaging requirements: `pip install tbump build tomlkit==0.7.0`
13+
14+
### Bump version
15+
16+
- `export version=<NEW_VERSION>`
17+
- `tbump ${version} --no-push`
18+
19+
### Push to GitHub
1120

1221
```bash
13-
# Commit, test, publish, tag release
14-
bump2version minor # CHECK FIRST: If the patch version currently set is not sufficient
15-
git commit -am "Prepared <release-id>"
16-
bump2version suffix # Remove the .dev
17-
git commit -am "Generated release <release-id>"
18-
git tag <release_version_here>
19-
git push && git push --tags
22+
git push upstream && git push upstream --tags
2023
```
2124

22-
## Push to PyPI
25+
### Push to PyPI
2326

2427
```bash
2528
rm -rf dist/*
2629
rm -rf build/*
27-
python setup.py sdist bdist_wheel
28-
# Double check the dist/* files have the right verison (no `.dev`) and install the wheel to ensure it's good
29-
pip install dist/*
30+
python -m build .
3031
twine upload dist/*
3132
```
32-
33-
## Prep repo for development
34-
35-
- `bumpversion patch # Resets the patch and dev versions`
36-
- `git commit -am "Resumed patch dev"; git push`

docs/changelog.rst

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

docs/conf.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import sys
1717
import os
1818
import shlex
19+
import shutil
1920

2021
# If extensions (or modules to document with autodoc) are in another directory,
2122
# add these directories to sys.path here. If the directory is relative to the
@@ -320,3 +321,9 @@
320321
html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
321322

322323
# otherwise, readthedocs.org uses their theme by default, so no need to specify it
324+
325+
326+
def setup(app):
327+
HERE = os.path.abspath(os.path.dirname(__file__))
328+
dest = os.path.join(HERE, 'changelog.md')
329+
shutil.copy(os.path.join(HERE, '..', 'CHANGELOG.md'), dest)

0 commit comments

Comments
 (0)