jupyter-server · Mar 29, 2022 · Mar 31, 2022 · Mar 31, 2022 · Apr 2, 2022 · Apr 2, 2022
diff --git a/.github/workflows/check-release.yml b/.github/workflows/check-release.yml
@@ -1,9 +1,8 @@
 name: Check Release
 on:
   push:
-    branches: ["main"]
+    branches: ["1.x"]
   pull_request:
-    branches: ["*"]
 
 jobs:
   check_release:

diff --git a/.github/workflows/enforce-label.yml b/.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
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -1,9 +1,9 @@
 name: Jupyter Server Integration Tests [Linux]
 on:
   push:
-    branches: ["main"]
+    branches: ["1.x"]
   pull_request:
-    branches: ["*"]
+
 jobs:
   build:
     runs-on: ${{ matrix.os }}
@@ -28,3 +28,14 @@ jobs:
       - name: Run the tests
         run: |
           pytest -vv --integration_tests=true tests
+
+  integration_check: # This job does nothing and is only used for the branch protection
+    if: always()
+    needs:
+      - build
+    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) }}
diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -1,7 +1,7 @@
 name: Jupyter Server Tests
 on:
   push:
-    branches: ["main"]
+    branches: ["1.x"]
   pull_request:
   schedule:
     - cron: "0 8 * * *"
@@ -33,8 +33,8 @@ jobs:
       - name: Run the tests
         if: ${{ !startsWith(matrix.python-version, 'pypy') && !startsWith(matrix.os, 'windows') }}
         run: |
-          args="-vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered --cov-fail-under 70"
-          python -m pytest $args || python -m pytest $args --lf
+          args="-vv --cov jupyter_server --cov-branch --cov-report term-missing:skip-covered"
+          python -m pytest $args  --cov-fail-under 70 || python -m pytest $args --lf
       - name: Run the tests on pypy and windows
         if: ${{ startsWith(matrix.python-version, 'pypy') || startsWith(matrix.os, 'windows') }}
         run: |
@@ -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
@@ -78,7 +98,7 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/install-minimums@v1
       - name: Run the unit tests
         run: |
-          pytest -vv || pytest -vv --lf
+          pytest -vv -W default || pytest -vv -W default --lf
 
   test_prereleases:
     name: Test Prereleases
@@ -103,39 +123,32 @@ jobs:
   make_sdist:
     name: Make SDist
     runs-on: ubuntu-latest
-    timeout-minutes: 20
+    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
+
+  python_tests_check: # This job does nothing and is only used for the branch protection
+    if: always()
+    needs:
+      - build
+      - pre-commit
+      - test_prereleases
+      - make_sdist
+      - test_sdist
+    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) }}
diff --git a/.github/workflows/trigger_precommit.yml b/.github/workflows/trigger_precommit.yml
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -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,10 +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.32.0
+    hooks:
+      - id: pyupgrade
+        args: [--py37-plus]
+
+  - repo: https://github.com/PyCQA/doc8
+    rev: 0.11.1
+    hooks:
+      - id: doc8
+        args: [--max-line-length=200]
+        stages: [manual]
+
   - repo: https://github.com/pycqa/flake8
     rev: 4.0.1
     hooks:
@@ -46,17 +56,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.3
     hooks:
       - id: check-jsonschema
         name: "Check GitHub Workflows"
         files: ^\.github/workflows/
         types: [yaml]
         args: ["--schemafile", "https://json.schemastore.org/github-workflow"]
+        stages: [manual]
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -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
 --------------------------------
 

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 # Jupyter Server
 
-[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3Amain++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3Amain++)
-[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=latest)](http://jupyter-server.readthedocs.io/en/latest/?badge=latest)
+[![Build Status](https://github.com/jupyter/jupyter_server/workflows/CI/badge.svg?query=branch%3A1.x++)](https://github.com/jupyter-server/jupyter_server/actions?query=branch%3A1.x++)
+[![Documentation Status](https://readthedocs.org/projects/jupyter-server/badge/?version=stable)](http://jupyter-server.readthedocs.io/en/latest/?badge=stable)
 
 The Jupyter Server provides the backend (i.e. the core services, APIs, and REST endpoints) for Jupyter web applications like Jupyter notebook, JupyterLab, and Voila.
 
-For more information, read our [documentation here](http://jupyter-server.readthedocs.io/en/latest/?badge=latest).
+For more information, read our [documentation here](http://jupyter-server.readthedocs.io/en/stable/?badge=latest).
 
 ## Installation and Basic usage
 
@@ -22,7 +22,7 @@ If Jupyter Server is a dependency of your project/application, it is important t
 
 When a new minor version is released on PyPI, a branch for that version will be created in this repository, and the version of the main branch will be bumped to the next minor version number. That way, the main branch always reflects the latest un-released version.
 
-To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/main/CHANGELOG.md).
+To see the changes between releases, checkout the [CHANGELOG](https://github.com/jupyter/jupyter_server/blob/1.x/CHANGELOG.md).
 
 ## Usage - Running Jupyter Server
 
@@ -34,7 +34,7 @@ Launch with:
 
 ### Testing
 
-See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/main/CONTRIBUTING.rst#running-tests).
+See [CONTRIBUTING](https://github.com/jupyter-server/jupyter_server/blob/1.x/CONTRIBUTING.rst#running-tests).
 
 ## Contributing
 

diff --git a/docs/README.md b/docs/README.md
@@ -1,3 +1,3 @@
 # Jupyter Server Docs Sources
 
-Read [this page](https://jupyter-server.readthedocs.io/en/latest/contributors/contributing.html#building-the-docs) to build the docs.
+Read [this page](https://jupyter-server.readthedocs.io/en/stable/contributors/contributing.html#building-the-docs) to build the docs.
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # Jupyter Server documentation build configuration file, created by
 # sphinx-quickstart on Mon Apr 13 09:51:11 2015.

diff --git a/docs/source/contributors/team-meetings.rst b/docs/source/contributors/team-meetings.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
 

diff --git a/docs/source/developers/dependency.rst b/docs/source/developers/dependency.rst
@@ -1,9 +1,15 @@
 Depending on Jupyter Server
 ===========================
 
-If your project depends directly on Jupyter Server, be sure to watch Jupyter Server's ChangeLog and pin your project to a version that works for your application. Major releases represent possible backwards-compatibility breaking API changes or features.
-
-When a new major version in released on PyPI, a branch for that version will be created in this repository, and the version of the master branch will be bumped to the next major version number. That way, the master branch always reflects the latest un-released version.
+If your project depends directly on Jupyter Server, be sure to watch Jupyter
+Server's ChangeLog and pin your project to a version that works for your
+application. Major releases represent possible backwards-compatibility breaking
+API changes or features.
+
+When a new major version in released on PyPI, a branch for that version will be
+created in this repository, and the version of the master branch will be bumped
+to the next major version number. That way, the master branch always reflects
+the latest un-released version.
 
 To install the latest patch of a given version: