.bumpversion.cfg

@@ -1,10 +1,10 @@
 [bumpversion]
-current_version = 3, 3, 1, 'final', 0
+current_version = 3, 3, 2, "final", 0
 commit = False
 tag = False
-parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \'(?P<release>\S+)\'\,\ (?P<build>\d+)
+parse = (?P<major>\d+)\,\ (?P<minor>\d+)\,\ (?P<patch>\d+)\,\ \"(?P<release>\S+)\"\,\ (?P<build>\d+)
 serialize = 
-	{major}, {minor}, {patch}, '{release}', {build}
+	{major}, {minor}, {patch}, "{release}", {build}
 
 [bumpversion:part:release]
 optional_value = final

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Run Black: https://github.com/jupyterlab/jupyterlab/pull/12282
+cde0521528481befbb81fda0be8fee77dc5455df

.github/workflows/linuxtests.yml

@@ -92,3 +92,47 @@ jobs:
         with:
           name: ${{ matrix.group }} ${{ github.run_number }}
           path: ./build/${{ matrix.group }}_output
+
+  make_sdist:
+    name: Make SDist
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    steps:
+      - uses: actions/checkout@v2
+      - name: Base Setup
+        uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+      - name: Install dependencies
+        run: |
+          bash ./scripts/ci_install.sh
+      - name: Build SDist
+        run: |
+          pip install build
+          python -m build --sdist
+      - uses: actions/upload-artifact@v2
+        with:
+          name: "sdist"
+          path: dist/*.tar.gz
+
+  test_sdist:
+    runs-on: ubuntu-latest
+    needs: [make_sdist]
+    name: Install from SDist and Test
+    timeout-minutes: 20
+    steps:
+      - name: Base Setup
+        uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1
+      - name: Download sdist
+        uses: actions/download-artifact@v2
+      - name: Install From SDist
+        run: |
+          set -ex
+          cd sdist
+          mkdir test
+          tar --strip-components=1 -zxvf *.tar.gz -C ./test
+          cd test
+          pip install -e .[test]
+          pip install pytest-github-actions-annotate-failures
+      - name: Run Test
+        run: |
+          cd sdist/test
+          pytest -vv || pytest -vv --lf

CHANGELOG.md

@@ -12,6 +12,48 @@ github_url: 'https://github.com/jupyterlab/jupyterlab/blob/3.3.x/CHANGELOG.md'
 
 <!-- <START NEW CHANGELOG ENTRY> -->
 
+## 3.3.3
+
+([Full Changelog](https://github.com/jupyterlab/jupyterlab/compare/v3.3.2...d97ff7161640634f69e70b184b9e255a68620f95))
+
+### Enhancements made
+
+- Add a preferred-dir icon to the file browser crumbs [#12354](https://github.com/jupyterlab/jupyterlab/pull/12354) ([@echarles](https://github.com/echarles))
+- Adds preferKernel option to JupyterLab code [#12260](https://github.com/jupyterlab/jupyterlab/pull/12260) ([@jweill-aws](https://github.com/jweill-aws))
+- Add aria progressbar role and data-status for testing in extensions [#12238](https://github.com/jupyterlab/jupyterlab/pull/12238) ([@krassowski](https://github.com/krassowski))
+
+### Bugs fixed
+
+- Fix Markdown cell generates duplicate toc content (#12312) [#12314](https://github.com/jupyterlab/jupyterlab/pull/12314) ([@yangql176](https://github.com/yangql176))
+- Fix settings with `null` default not getting marked as modified [#12240](https://github.com/jupyterlab/jupyterlab/pull/12240) ([@krassowski](https://github.com/krassowski))
+- Allow linear and radial gradient [#12276](https://github.com/jupyterlab/jupyterlab/pull/12276) ([@krassowski](https://github.com/krassowski))
+- Don't rely on search results to filter installed extension [#12249](https://github.com/jupyterlab/jupyterlab/pull/12249) ([@fcollonval](https://github.com/fcollonval))
+- Fix directory not found error when preferred_dir is set [#12220](https://github.com/jupyterlab/jupyterlab/pull/12220) ([@andrewfulton9](https://github.com/andrewfulton9))
+- Fix state restoration in the notebook extension [#12218](https://github.com/jupyterlab/jupyterlab/pull/12218) ([@jtpio](https://github.com/jtpio))
+- Fix sdist editable install and add tests [#12224](https://github.com/jupyterlab/jupyterlab/pull/12224) ([@blink1073](https://github.com/blink1073))
+
+### Maintenance and upkeep improvements
+
+- [3.3.x] Add git-blame-ignore-revs file [#12289](https://github.com/jupyterlab/jupyterlab/pull/12289) ([@blink1073](https://github.com/blink1073))
+- [3.3.x] Run black [#12282](https://github.com/jupyterlab/jupyterlab/pull/12282) ([@blink1073](https://github.com/blink1073))
+- Stop using py.test [#12262](https://github.com/jupyterlab/jupyterlab/pull/12262) ([@fcollonval](https://github.com/fcollonval))
+- Inline `expected_http_error` function from `jupyterlab_server.tests` [#12228](https://github.com/jupyterlab/jupyterlab/pull/12228) ([@jtpio](https://github.com/jtpio))
+
+### Documentation improvements
+
+- [3.3.x] Run black [#12282](https://github.com/jupyterlab/jupyterlab/pull/12282) ([@blink1073](https://github.com/blink1073))
+- Stop using py.test [#12262](https://github.com/jupyterlab/jupyterlab/pull/12262) ([@fcollonval](https://github.com/fcollonval))
+- Update link to `jupyterlab-some-package` in docs [#12248](https://github.com/jupyterlab/jupyterlab/pull/12248) ([@jtpio](https://github.com/jtpio))
+- Update command in Performance Testing to use the right option [#12215](https://github.com/jupyterlab/jupyterlab/pull/12215) ([@jweill-aws](https://github.com/jweill-aws))
+
+### Contributors to this release
+
+([GitHub contributors page for this release](https://github.com/jupyterlab/jupyterlab/graphs/contributors?from=2022-03-14&to=2022-04-07&type=c))
+
+[@afshin](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Aafshin+updated%3A2022-03-14..2022-04-07&type=Issues) | [@aiqc](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Aaiqc+updated%3A2022-03-14..2022-04-07&type=Issues) | [@ajbozarth](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Aajbozarth+updated%3A2022-03-14..2022-04-07&type=Issues) | [@blink1073](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ablink1073+updated%3A2022-03-14..2022-04-07&type=Issues) | [@bollwyvl](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Abollwyvl+updated%3A2022-03-14..2022-04-07&type=Issues) | [@damianavila](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Adamianavila+updated%3A2022-03-14..2022-04-07&type=Issues) | [@davidbrochart](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Adavidbrochart+updated%3A2022-03-14..2022-04-07&type=Issues) | [@echarles](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Aecharles+updated%3A2022-03-14..2022-04-07&type=Issues) | [@fcollonval](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Afcollonval+updated%3A2022-03-14..2022-04-07&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Agithub-actions+updated%3A2022-03-14..2022-04-07&type=Issues) | [@hbcarlos](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ahbcarlos+updated%3A2022-03-14..2022-04-07&type=Issues) | [@isabela-pf](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Aisabela-pf+updated%3A2022-03-14..2022-04-07&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ajtpio+updated%3A2022-03-14..2022-04-07&type=Issues) | [@jupyterlab-probot](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ajupyterlab-probot+updated%3A2022-03-14..2022-04-07&type=Issues) | [@jweill-aws](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ajweill-aws+updated%3A2022-03-14..2022-04-07&type=Issues) | [@krassowski](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Akrassowski+updated%3A2022-03-14..2022-04-07&type=Issues) | [@marthacryan](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Amarthacryan+updated%3A2022-03-14..2022-04-07&type=Issues) | [@martinRenou](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3AmartinRenou+updated%3A2022-03-14..2022-04-07&type=Issues) | [@meeseeksdev](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ameeseeksdev+updated%3A2022-03-14..2022-04-07&type=Issues) | [@meeseeksmachine](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ameeseeksmachine+updated%3A2022-03-14..2022-04-07&type=Issues) | [@mlucool](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Amlucool+updated%3A2022-03-14..2022-04-07&type=Issues) | [@rccern](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Arccern+updated%3A2022-03-14..2022-04-07&type=Issues) | [@welcome](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Awelcome+updated%3A2022-03-14..2022-04-07&type=Issues)
+
+<!-- <END NEW CHANGELOG ENTRY> -->
+
 ## 3.3.2
 
 ([Full Changelog](https://github.com/jupyterlab/jupyterlab/compare/v3.3.1...5abe7f69837af8c349d5448f6f3e70db6c48c6e0))
@@ -30,8 +72,6 @@ github_url: 'https://github.com/jupyterlab/jupyterlab/blob/3.3.x/CHANGELOG.md'
 
 [@fcollonval](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Afcollonval+updated%3A2022-03-09..2022-03-14&type=Issues) | [@github-actions](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Agithub-actions+updated%3A2022-03-09..2022-03-14&type=Issues) | [@jtpio](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ajtpio+updated%3A2022-03-09..2022-03-14&type=Issues) | [@jupyterlab-probot](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ajupyterlab-probot+updated%3A2022-03-09..2022-03-14&type=Issues) | [@meeseeksmachine](https://github.com/search?q=repo%3Ajupyterlab%2Fjupyterlab+involves%3Ameeseeksmachine+updated%3A2022-03-09..2022-03-14&type=Issues)
 
-<!-- <END NEW CHANGELOG ENTRY> -->
-
 ## 3.3.1
 
 ([Full Changelog](https://github.com/jupyterlab/jupyterlab/compare/v3.3.0...a51e1110263c28211ed9e8e0a4bba247c828af94))

binder/jupyter_notebook_config.py

@@ -1,58 +1,59 @@
 common = [
-    '--no-browser',
-    '--debug',
-    '--port={port}',
-    '--ServerApp.ip=127.0.0.1',
+    "--no-browser",
+    "--debug",
+    "--port={port}",
+    "--ServerApp.ip=127.0.0.1",
     '--ServerApp.token=""',
     # Disable dns rebinding protection here, since our 'Host' header
     # is not going to be localhost when coming from hub.mybinder.org
-    '--ServerApp.allow_remote_access=True'
+    "--ServerApp.allow_remote_access=True",
 ]
 
-lab_command = ' '.join([
-    'jupyter',
-    'lab',
-    '--dev-mode',
-    '--extensions-in-dev-mode',
-    '--collaborative',
-    '--ServerApp.base_url={base_url}lab-dev',
-] + common + ['>jupyterlab-dev.log 2>&1'])
-
-
-lab_splice_command = ' '.join([
-    'jupyter',
-    'lab',
-    'build',
-    '--splice-source',
-    '--minimize=False',
-    '--dev-build=True',
-    '--debug',
-    '>jupyterlab-spliced.log 2>&1',
-    '&&',
-    'jupyter',
-    'lab',
-    '--ServerApp.base_url={base_url}lab-spliced',
-] + common + ['>jupyterlab-spliced.log 2>&1'])
+lab_command = " ".join(
+    [
+        "jupyter",
+        "lab",
+        "--dev-mode",
+        "--extensions-in-dev-mode",
+        "--collaborative",
+        "--ServerApp.base_url={base_url}lab-dev",
+    ]
+    + common
+    + [">jupyterlab-dev.log 2>&1"]
+)
+
+
+lab_splice_command = " ".join(
+    [
+        "jupyter",
+        "lab",
+        "build",
+        "--splice-source",
+        "--minimize=False",
+        "--dev-build=True",
+        "--debug",
+        ">jupyterlab-spliced.log 2>&1",
+        "&&",
+        "jupyter",
+        "lab",
+        "--ServerApp.base_url={base_url}lab-spliced",
+    ]
+    + common
+    + [">jupyterlab-spliced.log 2>&1"]
+)
 
 
 c.ServerProxy.servers = {
-    'lab-dev': {
-        'command': [
-            '/bin/bash', '-c', lab_command
-        ],
-        'timeout': 60,
-        'absolute_url': True
+    "lab-dev": {"command": ["/bin/bash", "-c", lab_command], "timeout": 60, "absolute_url": True},
+    "lab-spliced": {
+        "command": ["/bin/bash", "-c", lab_splice_command],
+        "timeout": 300,
+        "absolute_url": True,
     },
-    'lab-spliced': {
-        'command': [
-            '/bin/bash', '-c', lab_splice_command
-        ],
-        'timeout': 300,
-        'absolute_url': True
-    }
 }
 
-c.NotebookApp.default_url = '/lab-dev'
+c.NotebookApp.default_url = "/lab-dev"
 
 import logging
+
 c.NotebookApp.log_level = logging.DEBUG

binder/start

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-import sys
-import shutil
 import os
+import shutil
+import sys
 
 argv = sys.argv[1:] + ['--config', 'binder/jupyter_notebook_config.py']
 print(argv)

builder/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/builder",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "JupyterLab - Extension Builder",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -33,7 +33,7 @@
     "watch": "tsc -w --listEmittedFiles"
   },
   "dependencies": {
-    "@jupyterlab/buildutils": "^3.3.2",
+    "@jupyterlab/buildutils": "^3.3.3",
     "@lumino/algorithm": "^1.3.3",
     "@lumino/application": "^1.16.0",
     "@lumino/commands": "^1.12.0",

buildutils/package.json

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

buildutils/template/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupyterlab/template",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "JupyterLab - Package Template",
   "homepage": "https://github.com/jupyterlab/jupyterlab",
   "bugs": {
@@ -37,7 +37,7 @@
     "watch": "tsc -b --watch"
   },
   "devDependencies": {
-    "@jupyterlab/testutils": "^3.3.2",
+    "@jupyterlab/testutils": "^3.3.3",
     "@types/jest": "^26.0.10",
     "jest": "^26.4.2",
     "rimraf": "~3.0.0",

clean.py

@@ -5,38 +5,32 @@
 
 
 # Workaround for https://github.com/git-for-windows/git/issues/607
-if os.name == 'nt':
+if os.name == "nt":
     for (root, dnames, files) in os.walk(here):
-        if 'node_modules' in dnames:
-            subprocess.check_call(['rmdir', '/s', '/q', 'node_modules'],
-                                  cwd=root, shell=True)
-            dnames.remove('node_modules')
+        if "node_modules" in dnames:
+            subprocess.check_call(["rmdir", "/s", "/q", "node_modules"], cwd=root, shell=True)
+            dnames.remove("node_modules")
 
 
-subprocess.check_call('python -m pip uninstall -y jupyterlab'.split(), cwd=here)
+subprocess.check_call("python -m pip uninstall -y jupyterlab".split(), cwd=here)
+
 
 def resolvePattern(pat):
-    """handle a leading `#` or `@` in a pattern
-    """
+    """handle a leading `#` or `@` in a pattern"""
     pat = pat.strip()
 
-    if not pat or pat.startswith('#'):
+    if not pat or pat.startswith("#"):
         return []
-    elif pat.startswith('@'):
+    elif pat.startswith("@"):
         raw = pat[1:]
-        return [
-            raw,
-            f'!packages/**/{raw}',
-            f'!**/node_modules/**/{raw}'
-        ]
+        return [raw, f"!packages/**/{raw}", f"!**/node_modules/**/{raw}"]
     else:
         return [pat]
 
+
 # get the exclude patterns listed in .cleanignore
-with open(os.path.join(here, '.cleanignore')) as f:
-    git_clean_exclude = [f'--exclude={pat}'
-                         for line in f
-                         for pat in resolvePattern(line)]
+with open(os.path.join(here, ".cleanignore")) as f:
+    git_clean_exclude = [f"--exclude={pat}" for line in f for pat in resolvePattern(line)]
 
-git_clean_command = ['git', 'clean', '-dfx'] + git_clean_exclude
+git_clean_command = ["git", "clean", "-dfx"] + git_clean_exclude
 subprocess.check_call(git_clean_command, cwd=here)

conftest.py

@@ -5,25 +5,22 @@
 
 import pytest
 
-
 pytest_plugins = [
     "jupyter_server.pytest_plugin",
     "jupyterlab_server.pytest_plugin",
-    "jupyterlab.pytest_plugin"
+    "jupyterlab.pytest_plugin",
 ]
 
 
 def pytest_addoption(parser):
     """
-    Adds flags for py.test.
+    Adds flags for pytest.
 
     This is called by the pytest API
     """
     group = parser.getgroup("general")
-    group.addoption('--quick', action='store_true',
-                    help="Skip slow tests")
-    group.addoption('--slow', action='store_true',
-                    help="Run only slow tests")
+    group.addoption("--quick", action="store_true", help="Skip slow tests")
+    group.addoption("--slow", action="store_true", help="Run only slow tests")
 
 
 def pytest_configure(config):