merge upstream 4.1.x

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 4, 1, 0, "final", 0
+current_version = 4, 1, 5, "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/pull_request_template.md

@@ -2,7 +2,7 @@
 Thanks for contributing to JupyterLab!
 Please fill out the following items to submit a pull request.
 See the contributing guidelines for more information:
-https://github.com/jupyterlab/jupyterlab/blob/main/CONTRIBUTING.md
+https://github.com/jupyterlab/jupyterlab/blob/4.1.x/CONTRIBUTING.md
 -->
 
 ## References

.github/workflows/check-release.yml

@@ -2,9 +2,9 @@ name: Check Release
 
 on:
   push:
-    branches: [main]
+    branches: [4.1.x]
   pull_request:
-    branches: [main]
+    branches: [4.1.x]
   release:
     types: [published]
 

.github/workflows/codeql-analysis.yml

@@ -7,10 +7,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [main]
+    branches: [4.1.x]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [main]
+    branches: [4.1.x]
   schedule:
     - cron: '0 8 * * 3'
 

.github/workflows/docker-test.yml

@@ -3,10 +3,15 @@ name: Docker Tests
 on:
   schedule:
     - cron: '0 0 * * *'
+  push:
+    branches: [4.1.x]
+  pull_request:
+    branches: [4.1.x]
 
 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/linuxjs-tests.yml

@@ -2,9 +2,9 @@ name: Linux JS Tests
 
 on:
   push:
-    branches: [main]
+    branches: [4.1.x]
   pull_request:
-    branches: [main]
+    branches: [4.1.x]
   release:
     types: [published]
 

.github/workflows/linuxtests.yml

@@ -2,9 +2,9 @@ name: Linux Tests
 
 on:
   push:
-    branches: [main]
+    branches: [4.1.x]
   pull_request:
-    branches: [main]
+    branches: [4.1.x]
   release:
     types: [published]
 
@@ -154,4 +154,4 @@ jobs:
       - uses: jupyterlab/maintainer-tools/.github/actions/check-links@v1
         with:
           ignore_glob: "docs/api packages/ui-components/docs/source/ui_components.rst images"
-          ignore_links: ".*/images/[\\w-]+.png https://docs.github.com/en/.* https://jupyterlab.github.io https://mybinder.org/v2/gh/jupyterlab/.*"
+          ignore_links: ".*/images/[\\w-]+.png https://docs.github.com/en/.* https://jupyterlab.github.io https://mybinder.org/v2/gh/jupyterlab/.* https://github.com/[^/]+/?$"

.github/workflows/macostests.yml

@@ -2,9 +2,9 @@ name: macOS Tests
 
 on:
   push:
-    branches: [main]
+    branches: [4.1.x]
   pull_request:
-    branches: [main]
+    branches: [4.1.x]
   release:
     types: [published]
 

.github/workflows/windowstests.yml

@@ -2,9 +2,9 @@ name: Windows Tests
 
 on:
   push:
-    branches: [main]
+    branches: [4.1.x]
   pull_request:
-    branches: [main]
+    branches: [4.1.x]
   release:
     types: [published]
 

.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.15
+    rev: v0.2.0
     hooks:
       - id: ruff
         args: ["--fix"]

CONTRIBUTING.md

@@ -4,5 +4,5 @@ If you're reading this section, you're probably interested in contributing to
 JupyterLab. Welcome and thanks for your interest in contributing!
 
 Please take a look at Contributing to Jupyterlab on
-[Read the Docs](https://jupyterlab.readthedocs.io/en/latest/developer/contributing.html) or
+[Read the Docs](https://jupyterlab.readthedocs.io/en/stable/developer/contributing.html) or
 [Repo docs](docs/source/developer/contributing.rst) (for the latest).

README.md

@@ -34,7 +34,7 @@ via [PyPI](https://pypi.org/search/?q=jupyterlab&o=-created&c=Framework+%3A%3A+J
 conda, and other package managers. The _source_ extensions can be installed
 directly from npm (search for [jupyterlab-extension](https://www.npmjs.com/search?q=keywords:jupyterlab-extension)) but require an additional build step.
 You can also find JupyterLab extensions exploring GitHub topic [jupyterlab-extension](https://github.com/topics/jupyterlab-extension).
-To learn more about extensions, see the [user documentation](https://jupyterlab.readthedocs.io/en/latest/user/extensions.html).
+To learn more about extensions, see the [user documentation](https://jupyterlab.readthedocs.io/en/stable/user/extensions.html).
 
 Read the current JupyterLab documentation on [ReadTheDocs](http://jupyterlab.readthedocs.io/en/stable/).
 
@@ -60,7 +60,7 @@ If you use [conda](https://docs.conda.io/en/latest/), [mamba](https://mamba.read
   ```
   If installing using `pip install --user`, you must add the user-level `bin` directory to your `PATH` environment variable in order to launch `jupyter lab`. If you are using a Unix derivative (e.g., FreeBSD, GNU/Linux, macOS), you can do this by running `export PATH="$HOME/.local/bin:$PATH"`. If you are using a macOS version that comes with Python 2, run `pip3` instead of `pip`.
 
-For more detailed instructions, consult the [installation guide](http://jupyterlab.readthedocs.io/en/latest/getting_started/installation.html). Project installation instructions from the git sources are available in the [contributor documentation](CONTRIBUTING.md).
+For more detailed instructions, consult the [installation guide](http://jupyterlab.readthedocs.io/en/stable/getting_started/installation.html). Project installation instructions from the git sources are available in the [contributor documentation](CONTRIBUTING.md).
 
 #### Installing with Previous Versions of Jupyter Notebook
 
@@ -78,7 +78,7 @@ Start up JupyterLab using:
 jupyter lab
 ```
 
-JupyterLab will open automatically in the browser. See the [documentation](http://jupyterlab.readthedocs.io/en/latest/getting_started/starting.html) for additional details.
+JupyterLab will open automatically in the browser. See the [documentation](http://jupyterlab.readthedocs.io/en/stable/getting_started/starting.html) for additional details.
 
 If you encounter an error like "Command 'jupyter' not found", please make sure `PATH` environment variable is set correctly. Alternatively, you can start up JupyterLab using `~/.local/bin/jupyter lab` without changing the `PATH` environment variable.
 
@@ -90,7 +90,7 @@ The latest versions of the following browsers are currently _known to work_:
 - Chrome
 - Safari
 
-See our [documentation](http://jupyterlab.readthedocs.io/en/latest/getting_started/installation.html) for additional details.
+See our [documentation](http://jupyterlab.readthedocs.io/en/stable/getting_started/installation.html) for additional details.
 
 ---
 
@@ -100,7 +100,7 @@ We encourage you to ask questions on the [Discourse forum](https://discourse.jup
 
 ### Bug report
 
-To report a bug please read the [guidelines](https://jupyterlab.readthedocs.io/en/latest/getting_started/issue.html) and then open a [Github issue](https://github.com/jupyterlab/jupyterlab/issues/new?labels=bug%2C+status%3ANeeds+Triage&template=bug_report.md). To keep resolved issues self-contained, the [lock bot](https://github.com/apps/lock) will lock closed issues as resolved after a period of inactivity. If a related discussion is still needed after an issue is locked, please open a new issue and reference the old issue.
+To report a bug please read the [guidelines](https://jupyterlab.readthedocs.io/en/stable/getting_started/issue.html) and then open a [Github issue](https://github.com/jupyterlab/jupyterlab/issues/new?labels=bug%2C+status%3ANeeds+Triage&template=bug_report.md). To keep resolved issues self-contained, the [lock bot](https://github.com/apps/lock) will lock closed issues as resolved after a period of inactivity. If a related discussion is still needed after an issue is locked, please open a new issue and reference the old issue.
 
 ### Feature request
 
@@ -112,37 +112,37 @@ We also welcome suggestions for new features as they help make the project more
 
 ### Extending JupyterLab
 
-To start developing an extension for JupyterLab, see the [developer documentation](https://jupyterlab.readthedocs.io/en/latest/extension/extension_dev.html) and the [API docs](https://jupyterlab.readthedocs.io/en/latest/api/).
+To start developing an extension for JupyterLab, see the [developer documentation](https://jupyterlab.readthedocs.io/en/stable/extension/extension_dev.html) and the [API docs](https://jupyterlab.readthedocs.io/en/stable/api/).
 
 ### Contributing
 
-To contribute code or documentation to JupyterLab itself, please read the [contributor documentation](https://jupyterlab.readthedocs.io/en/latest/developer/contributing.html).
+To contribute code or documentation to JupyterLab itself, please read the [contributor documentation](https://jupyterlab.readthedocs.io/en/stable/developer/contributing.html).
 
 JupyterLab follows the Jupyter [Community Guides](https://jupyter.readthedocs.io/en/latest/community/content-community.html).
 
 ### License
 
 JupyterLab uses a shared copyright model that enables all contributors to maintain the
-copyright on their contributions. All code is licensed under the terms of the revised [BSD license](https://github.com/jupyterlab/jupyterlab/blob/main/LICENSE).
+copyright on their contributions. All code is licensed under the terms of the revised [BSD license](https://github.com/jupyterlab/jupyterlab/blob/4.1.x/LICENSE).
 
 ### 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

@@ -262,9 +262,9 @@ These lines:
   - [ ] https://github.com/jupyterlab/jupyter-renderers
 - [ ] Publish a release (with a **updated tag**) to the [extension template](https://github.com/jupyterlab/extension-template/releases) with the new JupyterLab version
 - [ ] Update the extension examples:
-  - [ ] [Notebook toolbar button](https://github.com/jupyterlab/jupyterlab/blob/main/docs/source/extension/notebook.rst#adding-a-button-to-the-toolbar)
-  - [ ] [Notebook widget](https://github.com/jupyterlab/jupyterlab/blob/main/docs/source/extension/notebook.rst#adding-a-widget-to-the-notebook-header)
-- [ ] Update the [extension tutorial](https://github.com/jupyterlab/jupyterlab/blob/main/RELEASE.md#updating-the-extension-tutorial)
+  - [ ] [Notebook toolbar button](https://github.com/jupyterlab/jupyterlab/blob/4.1.x/docs/source/extension/notebook.rst#adding-a-button-to-the-toolbar)
+  - [ ] [Notebook widget](https://github.com/jupyterlab/jupyterlab/blob/4.1.x/docs/source/extension/notebook.rst#adding-a-widget-to-the-notebook-header)
+- [ ] Update the [extension tutorial](https://github.com/jupyterlab/jupyterlab/blob/4.1.x/RELEASE.md#updating-the-extension-tutorial)
 - [ ] At this point, there may have been some more commits merged. Run `python scripts/milestone_check.py` to check the issues assigned to this milestone one more time. Update changelog if necessary.
 
 Now do the actual final release:
@@ -276,7 +276,7 @@ Now do the actual final release:
 - [ ] Update the API [docs](#updating-api-docs)
 - [ ] Merge the PRs on the other repos and set the default branch of the
       xckd repo
-- [ ] Publish to [conda-forge](https://github.com/jupyterlab/jupyterlab/blob/main/RELEASE.md#publishing-to-conda-forge).
+- [ ] Publish to [conda-forge](https://github.com/jupyterlab/jupyterlab/blob/4.1.x/RELEASE.md#publishing-to-conda-forge).
 
 After a few days (to allow for possible patch releases), set up development for
 the next release:
@@ -285,7 +285,7 @@ the next release:
 - [ ] Put the commit and tags to main
 - [ ] Run `npm run publish:all` to publish the packages
 - [ ] Release the other repos as appropriate
-- [ ] Update version for [binder](https://github.com/jupyterlab/jupyterlab/blob/main/RELEASE.md#update-version-for-binder)
+- [ ] Update version for [binder](https://github.com/jupyterlab/jupyterlab/blob/4.1.x/RELEASE.md#update-version-for-binder)
 
 ### Updating the extension tutorial
 
@@ -425,7 +425,7 @@ frozen and non-frozen version of the files.
 
 - Create a new branch from the previous release branch
 - Use a ".x" in the branch name so we can continue to use it for patches
-- Update branch and RTD config in `ensure_repo.ts` and run `jlpm integrity` to update links - source should be the previous release branch
+- Update branch and RTD config in `buildutils/src/ensure-repo.ts` and run `jlpm integrity` to update links - source should be the previous release branch
 - Update readthedocs branch config as appropriate
 - Automated Release using "minor" - edit changelog for new section
 - Move through alpha and beta phases as appropriate
@@ -452,7 +452,7 @@ frozen and non-frozen version of the files.
 
 ### Alpha and Beta Phase
 
-- Update branch and RTD config in `ensure_repo.ts` and `jlpm integrity` to update links - source should be the previous branch
+- Update branch and RTD config in `buildutils/src/ensure-repo.ts` and `jlpm integrity` to update links - source should be the previous branch
 - Update readthedocs branch config as appropriate
 - Automated Release using "major" - edit changelog for new section
 - Move through alpha and beta phases as appropriate
@@ -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",
+  "version": "4.1.5",
   "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",
+  "version": "4.1.5",
   "description": "JupyterLab - Build Utilities",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {

buildutils/src/clean-packages.ts

@@ -13,7 +13,7 @@ exitOnUncaughtException();
 // Get all of the packages.
 const basePath = path.resolve('.');
 const baseConfig = readJSONFile(path.join(basePath, 'package.json'));
-const packageConfig = baseConfig.workspaces.packages;
+const packageConfig = baseConfig.workspaces.packages ?? baseConfig.workspaces;
 const skipSource = process.argv.indexOf('packages') === -1;
 const skipExamples = process.argv.indexOf('examples') === -1;
 

buildutils/src/ensure-repo.ts

@@ -36,8 +36,8 @@ type CoreData = Map<string, any>;
 // All other release branches should target a specific named version
 const URL_CONFIG = {
   source: 'main',
-  target: 'main',
-  rtdVersion: 'latest'
+  target: '4.1.x',
+  rtdVersion: 'stable'
 };
 
 // Data to ignore.

buildutils/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/template",
-  "version": "4.1.0",
+  "version": "4.1.5",
   "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",
+    "@jupyterlab/testing": "^4.1.5",
     "@types/jest": "^29.2.0",
     "rimraf": "~5.0.5",
     "typescript": "~5.1.6"