Merge branch 'main' into workflow-update-jupyterlab-dependencies

.github/ISSUE_TEMPLATE/config.yml

@@ -3,10 +3,10 @@ contact_links:
   - name: Is this a common issue? See our Docs.
     url: https://jupyter-notebook.readthedocs.io/en/latest/troubleshooting.html#what-to-do-when-things-go-wrong
     about: Before opening an issue, make sure your issue hasn't already been addressed in the documentation.
-  - name: \U0001F914 Support and all other questions, including if you're not sure what to do.
+  - name: 🤔 Support and all other questions, including if you're not sure what to do.
     url: https://discourse.jupyter.org/c/notebook/31
     about: If you have a question or you're having issues installing Jupyter Notebook, try posting on Discourse.
-  - name: "\U0001F4AC Chat with the devs"
+  - name: 💬 Chat with the devs
     url: https://app.gitter.im/#/room/#jupyter_notebook:gitter.im
     about: Ask short questions about using Jupyter Notebook
   - name: 📝 Do you have a feature request that may be applied upstream? See JupyterLab.

.github/workflows/build.yml

@@ -121,7 +121,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-12, windows-latest]
         python: ['3.8', '3.11', '3.12']
         include:
           - python: '3.8'
@@ -132,7 +132,7 @@ jobs:
             dist: 'notebook*.whl'
           - os: windows-latest
             py_cmd: python
-          - os: macos-latest
+          - os: macos-12
             py_cmd: python3
           - os: ubuntu-latest
             py_cmd: python

.github/workflows/buildutils.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U "jupyterlab>=4.2.0b1,<4.3" hatch
+          python -m pip install -U "jupyterlab>=4.3.0a1,<4.4" hatch
           jlpm
           jlpm run build
 
@@ -79,6 +79,6 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install -U "jupyterlab>=4.2.0b1,<4.3" pip
+          python -m pip install -U "jupyterlab>=4.3.0a1,<4.4" pip
           jlpm
           jlpm run build

.github/workflows/playwright-update.yml

@@ -9,7 +9,16 @@ permissions:
 
 jobs:
   update-snapshots:
-    if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, 'update playwright snapshots') }}
+    if: >
+      (
+        github.event.issue.author_association == 'OWNER' ||
+        github.event.issue.author_association == 'COLLABORATOR' ||
+        github.event.issue.author_association == 'MEMBER'
+      ) && github.event.issue.pull_request && (
+        contains(github.event.comment.body, 'please update playwright snapshots') ||
+        contains(github.event.comment.body, 'please update galata snapshots') ||
+        contains(github.event.comment.body, 'please update snapshots')
+      )
     runs-on: ubuntu-latest
     permissions:
       # Required by actions/update-snapshots
@@ -30,14 +39,43 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Checkout the branch from the PR that triggered the job
+      - name: Configure git to use https
+        run: git config --global hub.protocol https
+
+      - name: Get PR Info
+        id: pr
+        env:
+          PR_NUMBER: ${{ github.event.issue.number }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_REPO: ${{ github.repository }}
+          COMMENT_AT: ${{ github.event.comment.created_at }}
         run: |
-          # PR branch remote must be checked out using https URL
-          git config --global hub.protocol https
+          pr="$(gh api /repos/${GH_REPO}/pulls/${PR_NUMBER})"
+          head_sha="$(echo "$pr" | jq -r .head.sha)"
+          pushed_at="$(echo "$pr" | jq -r .pushed_at)"
+
+          if [[ $(date -d "$pushed_at" +%s) -gt $(date -d "$COMMENT_AT" +%s) ]]; then
+              echo "Updating is not allowed because the PR was pushed to (at $pushed_at) after the triggering comment was issued (at $COMMENT_AT)"
+              exit 1
+          fi
+
+          echo "head_sha=$head_sha" >> $GITHUB_OUTPUT
 
-          gh pr checkout ${{ github.event.issue.number }}
+      - name: Checkout the branch from the PR that triggered the job
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: gh pr checkout ${{ github.event.issue.number }}
+
+      - name: Validate the fetched branch HEAD revision
+        env:
+          EXPECTED_SHA: ${{ steps.pr.outputs.head_sha }}
+        run: |
+          actual_sha="$(git rev-parse HEAD)"
+
+          if [[ "$actual_sha" != "$EXPECTED_SHA" ]]; then
+              echo "The HEAD of the checked out branch ($actual_sha) differs from the HEAD commit available at the time when trigger comment was submitted ($EXPECTED_SHA)"
+              exit 1
+          fi
 
       - name: Base Setup
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1

.pre-commit-config.yaml

@@ -29,7 +29,7 @@ repos:
     rev: 'v2.2.6'
     hooks:
       - id: codespell
-        args: ['-L', 'hart,noteable']
+        args: ['-L', 'hart,noteable', '--skip', "*.spec.ts"]
         exclude: |
           (?x)^(
               yarn.lock|
@@ -44,7 +44,7 @@ repos:
         files: "^notebook"
         stages: [manual]
         args: ["--install-types", "--non-interactive"]
-        additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.2.0b1,<4.3"]
+        additional_dependencies: ["traitlets>=5.13", "tornado", "jupyter_server>=2.10", "jupyterlab_server>=2.25", "jupyterlab>=4.3.0a1,<4.4"]
 
   - repo: https://github.com/pre-commit/pygrep-hooks
     rev: 'v1.10.0'