From e9e2b820fede3b19b3e3a0442f13836d83ba3192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Krassowski?= <5832902+krassowski@users.noreply.github.com> Date: Wed, 20 Nov 2024 09:10:59 +0000 Subject: [PATCH 1/4] Run CI on Python 3.9 and 3.13 (drop 3.8 from testing matrix) (#16852) * Run CI on Python 3.9 and 3.13 (drop 3.8 from testing matrix) * Bump `setuptools` to fix minimum versions test. For reference it was: The conflict is caused by: The user requested setuptools>=40.8.0 The user requested (constraint) setuptools==40.1.0 * Try `setuptools>=40.9.0` * Setuptools 41.1.0 is minimum that works with Python 3.9 See https://github.com/pypa/setuptools/blob/e622859e278e1751175ded6f8f41ea3de06e4855/NEWS.rst#v4110 --- .github/workflows/linuxjs-tests.yml | 5 +---- .github/workflows/linuxtests.yml | 26 +++++++++++++------------- .github/workflows/macostests.yml | 4 ++-- .github/workflows/windowstests.yml | 1 + pyproject.toml | 2 +- 5 files changed, 18 insertions(+), 20 deletions(-) diff --git a/.github/workflows/linuxjs-tests.yml b/.github/workflows/linuxjs-tests.yml index 8fe4712b219f..bc649ec51f6a 100644 --- 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 index 3d4c346552c0..cb5feb71577a 100644 --- a/.github/workflows/linuxtests.yml +++ b/.github/workflows/linuxtests.yml @@ -15,7 +15,7 @@ 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 @@ -23,27 +23,27 @@ jobs: 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 index 9e7a38365339..ed5ebdc41178 100644 --- 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 index e9142e7fa527..d1eb9af9c519 100644 --- 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 index 4f96a1f6bb75..1d19bc2df2ab 100644 --- 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", From f2ccf6b5f4e2282e1b66c2950005bf522c44a93f Mon Sep 17 00:00:00 2001 From: Nicolas Brichet <32258950+brichet@users.noreply.github.com> Date: Thu, 21 Nov 2024 16:06:45 +0100 Subject: [PATCH 2/4] Restore viewport `min-height` when not windowing (#16979) --- packages/ui-components/src/components/windowedlist.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ui-components/src/components/windowedlist.ts b/packages/ui-components/src/components/windowedlist.ts index fd059bb8992e..782cb6ba3f86 100644 --- a/packages/ui-components/src/components/windowedlist.ts +++ b/packages/ui-components/src/components/windowedlist.ts @@ -1315,6 +1315,7 @@ export class WindowedList< private _applyNoWindowingStyles() { this._viewport.style.position = 'relative'; this._viewport.style.top = '0px'; + this._viewport.style.minHeight = ''; this._innerElement.style.height = ''; } /** From 006a459698a01a007759316aa08c25fe40f70725 Mon Sep 17 00:00:00 2001 From: Jason Weill <93281816+JasonWeill@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:34:26 -0800 Subject: [PATCH 3/4] Drag image prompt styling (#16972) * Revert "Alternate description for disabled filters" This reverts commit 059fb7eb562defb8040cf1d624dbf0cee7f544e0. * Revert "Revert "Alternate description for disabled filters"" This reverts commit 27ed1d0779c1dff9e78848a20669de4a06e88be2. * Diminishes border color when dragging multiple cells --------- Co-authored-by: Jeremy Tuloup --- packages/notebook/style/base.css | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/notebook/style/base.css b/packages/notebook/style/base.css index 17be4dc7b1bb..c7b237541996 100644 --- a/packages/notebook/style/base.css +++ b/packages/notebook/style/base.css @@ -204,6 +204,7 @@ flex: 0 0 auto; min-width: 36px; color: var(--jp-cell-inprompt-font-color); + opacity: 0.5; padding: var(--jp-code-padding); padding-left: 12px; font-family: var(--jp-cell-prompt-font-family); @@ -221,7 +222,13 @@ top: 8px; left: 8px; background: var(--jp-layout-color2); - border: var(--jp-border-width) solid var(--jp-input-border-color); + border-width: var(--jp-border-width); + border-style: solid; + border-color: color-mix( + in srgb, + var(--jp-input-border-color) 20%, + transparent + ); box-shadow: 2px 2px 4px 0 rgba(0, 0, 0, 0.12); } From a94535e2e1ebbac0035dc383d452841f93796201 Mon Sep 17 00:00:00 2001 From: krassowski <5832902+krassowski@users.noreply.github.com> Date: Sun, 24 Nov 2024 09:16:04 +0000 Subject: [PATCH 4/4] Pin Python version for visual regression testing to 3.11 --- .github/workflows/galata.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/galata.yml b/.github/workflows/galata.yml index fcf28f674dc3..662cab947922 100644 --- a/.github/workflows/galata.yml +++ b/.github/workflows/galata.yml @@ -23,6 +23,8 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + with: + python_version: "3.11" - name: Set up browser cache uses: actions/cache@v4