Merge branch 'jupyterlab:main' into master

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4, 1, 0, "candidate", 1
+current_version = 4, 1, 2, "final", 0
 commit = False
 tag = False
 parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \"(?P<release>\S+)\"\,\ (?P<build>\d+)

docker/Dockerfile.dockerignore → .dockerignore

@@ -40,3 +40,4 @@ tests/**/coverage
 tests/**/.cache-loader
 
 **/node_modules
+.yarn

.github/workflows/auto_author_assign.yml

@@ -12,4 +12,4 @@ jobs:
   assign-author:
     runs-on: ubuntu-latest
     steps:
-      - uses: toshimaru/auto-author-assign@v2.0.1
+      - uses: toshimaru/auto-author-assign@v2.1.0

.github/workflows/docker-test.yml

@@ -3,10 +3,15 @@ name: Docker Tests
 on:
   schedule:
     - cron: '0 0 * * *'
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
 
 jobs:
   docker:
     name: Docker Dev Container
+    if: ${{ github.event_name == 'schedule' }} || contains( github.event.pull_request.title, '[docker]')
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout

.github/workflows/galata.yml

@@ -25,7 +25,7 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
       - name: Set up browser cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ github.workspace }}/pw-browsers
@@ -116,7 +116,7 @@ jobs:
         uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
 
       - name: Set up browser cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ${{ github.workspace }}/pw-browsers

.github/workflows/reject-staging-changes.yml

@@ -16,7 +16,7 @@ jobs:
 
       - name: Get modified files in the staging directory
         id: modified-files-in-staging
-        uses: tj-actions/changed-files@v41.0.1
+        uses: tj-actions/changed-files@v42.0.2
         with:
           # only checks for modified files in this directory
           files: jupyterlab/staging

.pre-commit-config.yaml

@@ -27,13 +27,13 @@ repos:
         exclude: (.bumpversion.cfg|yarn.js)
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.27.3
+    rev: 0.27.4
     hooks:
       - id: check-github-workflows
 
   # Check ruff version is aligned with the one in pyproject.toml
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.11
+    rev: v0.2.0
     hooks:
       - id: ruff
         args: ["--fix"]

README.md

@@ -127,22 +127,22 @@ copyright on their contributions. All code is licensed under the terms of the re
 
 ### Team
 
-JupyterLab is part of [Project Jupyter](http://jupyter.org/) and is developed by an open community. The maintenance team is assisted by a much larger group of contributors to JupyterLab and Project Jupyter as a whole.
+JupyterLab is part of [Project Jupyter](https://jupyter.org/) and is developed by an open community. The maintenance team is assisted by a much larger group of contributors to JupyterLab and Project Jupyter as a whole.
 
 JupyterLab's current maintainers are listed in alphabetical order, with affiliation, and main areas of contribution:
 
 - Mehmet Bektas, Netflix (general development, extensions).
 - Alex Bozarth, IBM (general development, extensions).
 - Eric Charles, Datalayer, (general development, extensions).
-- Frédéric Collonval, QuantStack (general development, extensions).
-- Martha Cryan, IBM (general development, extensions).
+- Frédéric Collonval, WebScIT (general development, extensions).
+- Martha Cryan, Mito (general development, extensions).
 - Afshin Darian, QuantStack (co-creator, application/high-level architecture,
   prolific contributions throughout the code base).
 - Vidar T. Fauske, JPMorgan Chase (general development, extensions).
 - Brian Granger, AWS (co-creator, strategy, vision, management, UI/UX design,
   architecture).
 - Jason Grout, Databricks (co-creator, vision, general development).
-- Michał Krassowski, University of Oxford (general development, extensions).
+- Michał Krassowski, Quansight (general development, extensions).
 - Max Klein, JPMorgan Chase (UI Package, build system, general development, extensions).
 - Gonzalo Peña-Castellanos, QuanSight (general development, i18n, extensions).
 - Fernando Perez, UC Berkeley (co-creator, vision).

RELEASE.md

@@ -478,3 +478,4 @@ new issues show up in the future:
 - HTTP Error 502: Bad Gateway (JupyterLab `4.0.0a23`): https://github.com/jupyterlab/jupyterlab/issues/12324
 - Degraded performance of npm publish (JupyterLab `4.0.0b2`): https://github.com/jupyterlab/jupyterlab/issues/14431
 - Wrong URLs break publishing to npm with provenance: https://github.com/jupyterlab/jupyterlab/pull/15462
+- Release team missing privileges on packages removed in 4.0: https://github.com/jupyterlab/jupyterlab/issues/15677

binder/environment.yml

@@ -55,11 +55,5 @@ dependencies:
   - xeus-python
   # extra conda stuff
   - jsonschema-with-format-nongpl
-  # jupyter-collaboration 1.2.0
-  - jupyter_ydoc >=1.0.1,<2.0.0
-  - ypy-websocket >=0.12.1,<0.13.0
+  - jupyter-collaboration >= 2.0.1
   - jupyter_events >=0.7.0
-  - jupyter_server_fileid >=0.7.0,<1
-  - pip:
-    # can't be installed with `conda` in binder, due to `jupyterlab-link-share``
-    - jupyter-collaboration ==1.2.0

builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/builder",
-  "version": "4.1.0-rc.1",
+  "version": "4.1.2",
   "description": "JupyterLab - Extension Builder",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

buildutils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/buildutils",
-  "version": "4.1.0-rc.1",
+  "version": "4.1.2",
   "description": "JupyterLab - Build Utilities",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

buildutils/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/template",
-  "version": "4.1.0-rc.1",
+  "version": "4.1.2",
   "description": "JupyterLab - Package Template",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -37,7 +37,7 @@
     "watch": "tsc -b --watch"
   },
   "devDependencies": {
-    "@jupyterlab/testing": "^4.1.0-rc.1",
+    "@jupyterlab/testing": "^4.1.2",
     "@types/jest": "^29.2.0",
     "rimraf": "~5.0.5",
     "typescript": "~5.1.6"