Merge branch 'main' into fix/faster-std-rendering

krassowski · Nov 20, 2024 · e5716e7 · e5716e7
2 parents 4422598 + e9e2b82
commit e5716e7
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 20 deletions.
diff --git a/.github/workflows/linuxjs-tests.yml b/.github/workflows/linuxjs-tests.yml
@@ -13,10 +13,7 @@ jobs:
     name: JS
     strategy:
       matrix:
-        # Fix for https://github.com/jupyterlab/jupyterlab/issues/13903
-        include:
-          - group: js-debugger
-            python-version: '3.11'
+        python-version: ["3.13"]
         group:
           [
             js-application,

diff --git a/.github/workflows/linuxtests.yml b/.github/workflows/linuxtests.yml
@@ -15,35 +15,35 @@ jobs:
       matrix:
         group: [integrity, integrity2, integrity3, release_test, docs, usage, usage2, splice_source, python, examples, interop, nonode, lint]
         # This will be used by the base setup action
-        python-version: ["3.8", "3.12"]
+        python-version: ["3.9", "3.13"]
         include:
           - group: examples
             upload-output: true
           - group: release_test
             upload-output: true
         exclude:
           - group: integrity
-            python-version: "3.8"
+            python-version: "3.9"
           - group: integrity2
-            python-version: "3.8"
+            python-version: "3.9"
           - group: integrity3
-            python-version: "3.8"
+            python-version: "3.9"
           - group: release_test
-            python-version: "3.8"
+            python-version: "3.9"
           - group: docs
-            python-version: "3.8"
+            python-version: "3.9"
           - group: usage
-            python-version: "3.8"
+            python-version: "3.9"
           - group: usage2
-            python-version: "3.8"
+            python-version: "3.9"
           - group: nonode
-            python-version: "3.8"
+            python-version: "3.9"
           - group: lint
-            python-version: "3.8"
+            python-version: "3.9"
           - group: examples
-            python-version: "3.8"
+            python-version: "3.9"
           - group: splice_source
-            python-version: "3.8"
+            python-version: "3.9"
       fail-fast: false
     timeout-minutes: 45
     runs-on: ubuntu-22.04
@@ -88,7 +88,7 @@ jobs:
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
         with:
-          python_version: "3.8"
+          python_version: "3.9"
           dependency_type: minimum
       - name: Install dependencies
         run: |

diff --git a/.github/workflows/macostests.yml b/.github/workflows/macostests.yml
@@ -14,10 +14,10 @@ jobs:
     strategy:
       matrix:
         group: [integrity, python, usage, usage2]
-        python-version: [3.11]
+        python-version: [3.12]
         include:
           - group: python
-            python-version: 3.12
+            python-version: 3.13
       fail-fast: false
     timeout-minutes: 45
     runs-on: macos-latest

diff --git a/.github/workflows/windowstests.yml b/.github/workflows/windowstests.yml
@@ -14,6 +14,7 @@ jobs:
     strategy:
       matrix:
         group: [integrity, python]
+        python-version: ["3.13"]
       fail-fast: false
     runs-on: windows-latest
     timeout-minutes: 40

diff --git a/pyproject.toml b/pyproject.toml
@@ -47,7 +47,7 @@ dependencies = [
     "jupyterlab_server>=2.27.1,<3",
     "notebook_shim>=0.2",
     "packaging",
-    "setuptools>=40.1.0",
+    "setuptools>=41.1.0",
     "tomli>=1.2.2;python_version<\"3.11\"",
     "tornado>=6.2.0",
     "traitlets",