Merge remote-tracking branch 'origin/main'

.github/workflows/publish.yaml

@@ -41,7 +41,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20.x
+          node-version: "lts/*"
           registry-url: https://registry.npmjs.org
           cache-dependency-path: labextension/yarn.lock
 
@@ -121,7 +121,7 @@ jobs:
       # actions/setup-node creates an .npmrc file that references NODE_AUTH_TOKEN
       - uses: actions/setup-node@v4
         with:
-          node-version: 18.x
+          node-version: "lts/*"
           registry-url: https://registry.npmjs.org
 
       - name: Download artifacts from build

.github/workflows/test.yaml

@@ -45,7 +45,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: 20.x
+          node-version: "lts/*"
           registry-url: https://registry.npmjs.org
           cache-dependency-path: labextension/yarn.lock
 
@@ -68,7 +68,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     defaults:
       run:
-        shell: bash # windows default isn't bash
+        shell: bash --noprofile --norc -eo pipefail {0} # windows default isn't bash
 
     strategy:
       fail-fast: false
@@ -87,14 +87,18 @@ jobs:
             python-version: "3.8"
             pip-extras: lab
 
-          # FIXME: If https://github.com/jupyter/notebook/pull/7305 gets merged
-          #        and released, we can test "classic" with python 3.12 as well,
-          #        but until then we exclude it from being run as a Python 3.12
-          #        test and include it as a Python 3.11 test.
+          # pip-extras classic (notebook v6) isn't working with python 3.12 or
+          # later, so we exclude it here and then include it below to run with
+          # python 3.11 instead.
           - os: ubuntu-22.04
             python-version: "3.12"
             pip-extras: classic
         include:
+          # Compensates for an excluded test case above
+          - os: ubuntu-22.04
+            python-version: "3.11"
+            pip-extras: classic
+
           # this test is manually updated to reflect the lower bounds of
           # versions from dependencies
           - os: ubuntu-22.04
@@ -106,11 +110,6 @@ jobs:
               tornado==6.1.0
               traitlets==5.1.0
 
-          # Workaround for excluded 3.12 test mentioned in a FIXME above
-          - os: ubuntu-22.04
-            python-version: "3.11"
-            pip-extras: classic
-
     steps:
       - uses: actions/checkout@v4
 
@@ -119,7 +118,7 @@ jobs:
           python-version: "${{ matrix.python-version }}"
 
       - name: Update root build packages
-        run: pip install --upgrade pip
+        run: python -m pip install --upgrade pip
 
       - name: Download built artifacts
         uses: actions/download-artifact@v4

jupyter_server_proxy/_version.py

@@ -1,4 +1,4 @@
 # __version__ should be updated using tbump, based on configuration in
 # pyproject.toml, according to instructions in RELEASE.md.
 #
-__version__ = "4.1.1-0.dev"
+__version__ = "4.2.1-0.dev"

pyproject.toml

@@ -178,6 +178,9 @@ regex = '''
 message_template = "Bump to {new_version}"
 tag_template = "v{new_version}"
 
+[[tool.tbump.file]]
+src = "jupyter_server_proxy/_version.py"
+
 [[tool.tbump.file]]
 src = "pyproject.toml"