More Cleanup

.github/workflows/downstream.yml

@@ -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
 

.github/workflows/main.yml

@@ -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

.mailmap

@@ -26,7 +26,7 @@ David Hirschfeld <[email protected]> dhirschfeld <david.hirschfeld
 David P. Sanders <[email protected]> David P. Sanders <[email protected]>
 David Warde-Farley <[email protected]> David Warde-Farley <>
 Doug Blank <[email protected]> Doug Blank <[email protected]>
-Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]> 
+Eugene Van den Bulke <[email protected]> Eugene Van den Bulke <[email protected]>
 Evan Patterson <[email protected]> <[email protected]>
 Evan Patterson <[email protected]> <[email protected]>
 Evan Patterson <[email protected]> <[email protected]>

.pre-commit-config.yaml

@@ -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.1
     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.0
     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"]

docs/kernels.rst

@@ -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