Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jupyter/jupyter_client
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v7.2.1
Choose a base ref
...
head repository: jupyter/jupyter_client
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 01b2095d96c81c56edf8f5df44e12e476b2bcd87
Choose a head ref
  • 13 commits
  • 27 files changed
  • 3 contributors

Commits on Mar 31, 2022

  1. more ci and pytest cleanup

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    e53203a View commit details

  2. update flake8 and pre-commit

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    12e8214 View commit details

  3. update pre-commit hooks

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    50dd09a View commit details

  4. fix warnings handling

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    aae8105 View commit details

  5. fix localinterfaces

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    7ac139c View commit details

  6. add doc8

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    edb802c View commit details

  7. clean up downstream tests

    @blink1073
    blink1073 committed Mar 31, 2022
    Copy the full SHA
    4a30b0e View commit details

Commits on Apr 2, 2022

  1. Merge pull request #764 from blink1073/filter-warnings-3

    @blink1073
    blink1073 authored Apr 2, 2022
    Copy the full SHA
    66aea83 View commit details

Commits on Apr 4, 2022

  1. [pre-commit.ci] pre-commit autoupdate 

    updates:
- [github.com/pre-commit/mirrors-prettier: v2.6.1 → v2.6.2](pre-commit/mirrors-prettier@v2.6.1...v2.6.2)
- [github.com/PyCQA/doc8: 0.11.0 → 0.11.1](PyCQA/doc8@0.11.0...0.11.1)
    @pre-commit-ci
    pre-commit-ci[bot] authored Apr 4, 2022
    Copy the full SHA
    38d715f View commit details

  2. Merge pull request #765 from jupyter/pre-commit-ci-update-config

    @blink1073
    blink1073 authored Apr 4, 2022
    Copy the full SHA
    0bd6345 View commit details

Commits on Apr 7, 2022

  1. include py.typed file

    @blink1073
    blink1073 committed Apr 7, 2022
    Copy the full SHA
    732d631 View commit details

  2. add file

    @blink1073
    blink1073 committed Apr 7, 2022
    Copy the full SHA
    e9f9bee View commit details

  3. Merge pull request #766 from blink1073/add-py-typed 

    Include py.typed file
    @davidbrochart
    davidbrochart authored Apr 7, 2022
    Copy the full SHA
    01b2095 View commit details
52 changes: 26 additions & 26 deletions .github/workflows/downstream.yml
View file
Original file line number Diff line number Diff line change
@@ -10,45 +10,45 @@ concurrency:
cancel-in-progress: true

jobs:
tests:
ipykernel:
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
matrix:
python-version: ["3.9"]
fail-fast: false
timeout-minutes: 10
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

- name: Test IPykernel
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
- uses: actions/checkout@v2
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
with:
package_name: ipykernel
package_spec: "pyqt5 ipykernel[test]"

- name: Test NBClient
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
nbclient:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
with:
package_name: nbclient
env_values: IPYKERNEL_CELL_NAME=\<IPY-INPUT\>

# Note: Currently fails
# - name: Test QtConsole
# uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
# with:
# package_name: qtconsole

- name: Test nbconvert
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
nbconvert:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
with:
package_name: nbconvert

- name: Test jupyter_server
uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
jupyter_server:
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/downstream-test@v1
with:
package_name: jupyter_server

32 changes: 5 additions & 27 deletions .github/workflows/main.yml
View file
Original file line number Diff line number Diff line change
@@ -122,7 +122,7 @@ jobs:
- name: Install miniumum versions
uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
- name: Run the unit tests
run: pytest -vv jupyter_client || pytest -vv jupyter_client --lf
run: pytest -vv -W default jupyter_client || pytest -vv -W default jupyter_client --lf

test_prereleases:
name: Test Prereleases
@@ -150,36 +150,14 @@ jobs:
timeout-minutes: 10
steps:
- uses: actions/checkout@v2
- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- name: Build SDist
run: |
pip install build
python -m build --sdist
- uses: actions/upload-artifact@v2
with:
name: "sdist"
path: dist/*.tar.gz
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/make-sdist@v1

test_sdist:
runs-on: ubuntu-latest
needs: [make_sdist]
name: Install from SDist and Test
timeout-minutes: 20
steps:
- name: Base Setup
uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- name: Download sdist
uses: actions/download-artifact@v2
- name: Install From SDist
run: |
set -ex
cd sdist
mkdir test
tar --strip-components=1 -zxvf *.tar.gz -C ./test
cd test
pip install .[test]
- name: Run Test
run: |
cd sdist/test
pytest -vv || pytest -vv --lf
- uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
- uses: jupyterlab/maintainer-tools/.github/actions/test-sdist@v1
2 changes: 1 addition & 1 deletion .mailmap
View file
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ David Hirschfeld <david.hirschfeld@gazprom-mt.com> dhirschfeld <david.hirschfeld
David P. Sanders <dpsanders@gmail.com> David P. Sanders <dpsanders@ciencias.unam.mx>
David Warde-Farley <wardefar@iro.umontreal.ca> David Warde-Farley <>
Doug Blank <dblank@cs.brynmawr.edu> Doug Blank <doug.blank@gmail.com>
Eugene Van den Bulke <eugene.van-den-bulke@gmail.com> Eugene Van den Bulke <eugene.vandenbulke@gmail.com>
Eugene Van den Bulke <eugene.van-den-bulke@gmail.com> Eugene Van den Bulke <eugene.vandenbulke@gmail.com>
Evan Patterson <epatters@enthought.com> <epatters@EPattersons-MacBook-Pro.local>
Evan Patterson <epatters@enthought.com> <epatters@evan-laptop.localdomain>
Evan Patterson <epatters@enthought.com> <epatters@caltech.edu>
58 changes: 47 additions & 11 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,61 @@
ci:
skip: [check-jsonschema]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: end-of-file-fixer
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: requirements-txt-fixer
- id: check-added-large-files
- id: check-case-conflict
- id: check-toml
- id: check-yaml
- id: debug-statements
- id: forbid-new-submodules
- id: check-builtin-literals
- id: trailing-whitespace

- repo: https://github.com/asottile/reorder_python_imports
rev: v2.7.1
rev: v3.0.1
hooks:
- id: reorder-python-imports

- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.3.0
hooks:
- id: black
args: ["--line-length", "100"]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.5.1
rev: v2.6.2
hooks:
- id: prettier
- repo: https://gitlab.com/pycqa/flake8
rev: "3.9.2"

- repo: https://github.com/pycqa/flake8
rev: 4.0.1
hooks:
- id: flake8
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
additional_dependencies:
[
"flake8-bugbear==20.1.4",
"flake8-logging-format==0.6.0",
"flake8-implicit-str-concat==0.2.0",
]

- repo: https://github.com/PyCQA/doc8
rev: 0.11.1
hooks:
- id: end-of-file-fixer
- id: check-case-conflict
- id: check-executables-have-shebangs
- id: requirements-txt-fixer
- id: doc8
args: [--max-line-length=100]

- repo: https://github.com/sirosen/check-jsonschema
rev: 0.14.2
hooks:
- id: check-jsonschema
name: "Check GitHub Workflows"
files: ^\.github/workflows/
types: [yaml]
args: ["--schemafile", "https://json.schemastore.org/github-workflow"]
1 change: 1 addition & 0 deletions MANIFEST.in
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
include *.md
include *.txt
include jupyter_client/py.typed

# Documentation
graft docs
7 changes: 5 additions & 2 deletions docs/kernels.rst
View file
Original file line number Diff line number Diff line change
@@ -121,7 +121,9 @@ The user location takes priority over the system locations, and the case of the
names is ignored, so selecting kernels works the same way whether or not the
filesystem is case sensitive.
Since kernelspecs show up in URLs and other places,
a kernelspec is required to have a simple name, only containing ASCII letters, ASCII numbers, and the simple separators: ``-`` hyphen, ``.`` period, ``_`` underscore.
a kernelspec is required to have a simple name, only containing ASCII letters,
ASCII numbers, and the simple separators: ``-`` hyphen, ``.`` period, ``_``
underscore.

Other locations may also be searched if the :envvar:`JUPYTER_PATH` environment
variable is set.
@@ -143,7 +145,8 @@ JSON serialised dictionary containing the following keys and values:
When loading notebooks, if no matching kernelspec key (may differ across machines)
is found, a kernel with a matching `language` will be used.
This allows a notebook written on any Python or Julia kernel to be properly associated
with the user's Python or Julia kernel, even if they aren't listed under the same name as the author's.
with the user's Python or Julia kernel, even if they aren't listed under the
same name as the author's.
- **interrupt_mode** (optional): May be either ``signal`` or ``message`` and
specifies how a client is supposed to interrupt cell execution on this kernel,
either by sending an interrupt ``signal`` via the operating system's
Loading