Merge branch 'main' into jupyter_server_terminals

Author: Zsailer

.github/workflows/enforce-label.yml

@@ -6,6 +6,8 @@ on:
 jobs:
   enforce-label:
     runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
     steps:
       - name: enforce-triage-label
         uses: jupyterlab/maintainer-tools/.github/actions/enforce-label@v1

.github/workflows/python-tests.yml

@@ -43,6 +43,26 @@ jobs:
         run: |
           codecov
 
+  pre-commit:
+    name: pre-commit
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+      - uses: pre-commit/action@v2.0.0
+        with:
+          extra_args: --all-files --hook-stage=manual
+      - name: Help message if pre-commit fail
+        if: ${{ failure() }}
+        run: |
+          echo "You can install pre-commit hooks to automatically run formatting"
+          echo "on each commit with:"
+          echo "    pre-commit install"
+          echo "or you can run by hand on staged files with"
+          echo "    pre-commit run"
+          echo "or after-the-fact on already committed files with"
+          echo "    pre-commit run --all-files --hook-stage=manual"
+
   test_docs_and_examples:
     name: Test Docs and Examples
     timeout-minutes: 10

.github/workflows/trigger_precommit.yml

@@ -1,9 +1,6 @@
-ci:
-  skip: [check-jsonschema]
-
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: end-of-file-fixer
       - id: check-case-conflict
@@ -32,22 +29,23 @@ repos:
         args: [--profile=black]
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.6.1
+    rev: v2.6.2
     hooks:
       - id: prettier
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.31.1
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: [--py37-plus]
 
   - repo: https://github.com/PyCQA/doc8
-    rev: 0.11.0
+    rev: 0.11.1
     hooks:
       - id: doc8
         args: [--max-line-length=200]
         exclude: docs/source/other/full-config.rst
+        stages: [manual]
 
   - repo: https://github.com/pycqa/flake8
     rev: 4.0.1
@@ -59,17 +57,20 @@ repos:
             "flake8-logging-format==0.6.0",
             "flake8-implicit-str-concat==0.2.0",
           ]
+        stages: [manual]
 
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.12.0
+    rev: v8.13.0
     hooks:
       - id: eslint
+        stages: [manual]
 
   - repo: https://github.com/sirosen/check-jsonschema
-    rev: 0.14.1
+    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"]
+        stages: [manual]

.pre-commit-config.yaml

@@ -59,14 +59,17 @@ You can invoke the pre-commit hook by hand at any time with::
 
 which should run any autoformatting on your code
 and tell you about any errors it couldn't fix automatically.
-You may also install [black integration](https://github.com/psf/black#editor-integration)
+You may also install `black integration <https://github.com/psf/black#editor-integration>`_
 into your text editor to format code automatically.
 
 If you have already committed files before setting up the pre-commit
 hook with ``pre-commit install``, you can fix everything up using
 ``pre-commit run --all-files``. You need to make the fixing commit
 yourself after that.
 
+Some of the hooks only run on CI by default, but you can invoke them by
+running with the ``--hook-stage manual`` argument.
+
 Troubleshooting the Installation
 --------------------------------
 

CONTRIBUTING.rst

@@ -5,16 +5,28 @@ Team Meetings, Road Map and Calendar
 
 Many of the lead Jupyter Server developers meet weekly over Zoom. These meetings are open to everyone.
 
-To see when the next meeting is happening, watch this Github issue:
+To see when the next meeting is happening and how to attend, watch this Github issue:
 
-https://github.com/jupyter/jupyter_server/issues/126
+https://github.com/jupyter-server/team-compass/issues/15
+
+Meeting Notes
+-------------
+
+- `2022 <https://github.com/jupyter-server/team-compass/issues/15>`_
+- `2021 <https://github.com/jupyter-server/team-compass/issues/4>`_
+- `2019-2020 <https://github.com/jupyter-server/team-compass/issues/1>`_
+
+Roadmap
+-------
 
 Also check out Jupyter Server's roadmap where we track future plans for Jupyter Server:
 
-https://github.com/jupyter/jupyter_server/issues/127
+`Jupyter Server 2.0 Discussion <https://github.com/jupyter-server/team-compass/issues/24>`_
 
+`Archived roadmap <https://github.com/jupyter/jupyter_server/issues/127>`_
 
-Jupyter Calendar:
+Jupyter Calendar
+----------------
 
 .. raw:: html
 

docs/source/contributors/team-meetings.rst

@@ -82,3 +82,15 @@ A post-save hook to make a script equivalent whenever the notebook is saved
 
 This could be a simple call to ``jupyter nbconvert --to script``, but spawning
 the subprocess every time is quite slow.
+
+.. note::
+   Assigning a new hook to e.g. ``c.FileContentsManager.pre_save_hook`` will override any existing one.
+
+If you want to add new hooks and keep existing ones, you should use e.g.:
+
+.. code-block:: python
+
+    contents_manager.register_pre_save_hook(script_pre_save)
+    contents_manager.register_post_save_hook(script_post_save)
+
+Hooks will then be called in the order they were registered.

docs/source/developers/savehooks.rst

@@ -72,7 +72,7 @@ async def start_kernel(self, kernel_id=None, path=None, **kwargs):
                 kwargs["cwd"] = self.cwd_for_path(path)
 
         km = self.kernel_manager_factory(parent=self, log=self.log)
-        await km.start_kernel(**kwargs)
+        await km.start_kernel(kernel_id=kernel_id, **kwargs)
         kernel_id = km.kernel_id
         self._kernels[kernel_id] = km
 
@@ -368,6 +368,7 @@ async def refresh_model(self, model=None):
             self.log.debug("Request kernel at: %s" % self.kernel_url)
             try:
                 response = await gateway_request(self.kernel_url, method="GET")
+
             except web.HTTPError as error:
                 if error.status_code == 404:
                     self.log.warning("Kernel not found at: %s" % self.kernel_url)
@@ -434,14 +435,14 @@ async def start_kernel(self, **kwargs):
             response = await gateway_request(self.kernels_url, method="POST", body=json_body)
             self.kernel = json_decode(response.body)
             self.kernel_id = self.kernel["id"]
+            self.kernel_url = url_path_join(self.kernels_url, url_escape(str(self.kernel_id)))
             self.log.info(f"GatewayKernelManager started kernel: {self.kernel_id}, args: {kwargs}")
         else:
             self.kernel_id = kernel_id
+            self.kernel_url = url_path_join(self.kernels_url, url_escape(str(self.kernel_id)))
             self.kernel = await self.refresh_model()
             self.log.info(f"GatewayKernelManager using existing kernel: {self.kernel_id}")
 
-        self.kernel_url = url_path_join(self.kernels_url, url_escape(str(self.kernel_id)))
-
     async def shutdown_kernel(self, now=False, restart=False):
         """Attempts to stop the kernel process cleanly via HTTP."""
 

jupyter_server/gateway/managers.py

@@ -28,6 +28,9 @@ filterwarnings = [
 [tool.jupyter-releaser]
 skip = ["check-links"]
 
+[tool.jupyter-releaser.options]
+post-version-spec = "dev"
+
 [tool.tbump.version]
 current = "1.16.1.dev0"
 regex = '''