From 67621f5e854eadeb53979711e29bf7f1f0f05694 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 19 Apr 2022 17:49:02 +0200 Subject: [PATCH 1/7] Fix build workflow on CI --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 182744d608..f72df1a156 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,6 +50,7 @@ jobs: pytest -vv || pytest -vv --lf - name: Integration Tests + run: | jupyter labextension list 2>&1 | grep -ie "@jupyter-notebook/lab-extension.*enabled.*ok" - jupyter server extension list 2>&1 | grep -ie "notebook.*enabled" - python -m jupyterlab.browser_check From d08972320a994d0a2a71ad928550e05a8729f5d7 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 19 Apr 2022 17:59:10 +0200 Subject: [PATCH 2/7] Fix install command --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f72df1a156..b76d144030 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,7 +41,7 @@ jobs: - name: Install the package run: | - python -m pip install ".[test]"" + python -m pip install ".[test]" jlpm run build:test - name: Unit tests From e14c39df1947d0f132666b33d1c74d9417ea91ff Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 19 Apr 2022 18:13:33 +0200 Subject: [PATCH 3/7] Update dependencies --- setup.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.cfg b/setup.cfg index 3b964b9155..b44acf8f9f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,8 +34,8 @@ python_requires = >=3.7 install_requires = notebook_shim>=0.1,<0.2 jupyterlab>=4.0.0a23,<5 - jupyterlab_server~=2.3 - jupyter_server~=1.4 + jupyterlab_server>=2.11.1,<3 + jupyter_server>=1.16.0,<2 tornado>=6.1.0 [options.extras_require] @@ -50,7 +50,7 @@ test = pytest-console-scripts ipykernel pre-commit - jupyterlab_server[test] + jupyterlab_server[test]>=2.11.1,<3 [options.packages.find] exclude = From 3e1d4562c94f7ff7395ccc59c7b5cfe29bbb9ecf Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Tue, 19 Apr 2022 21:39:26 +0200 Subject: [PATCH 4/7] Add back filter warning --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 83b90a2e61..1f3b9bf532 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,5 +29,7 @@ timeout = 300 # timeout_method = "thread" filterwarnings = [ "error", + # Pending release of https://github.com/jupyterlab/jupyterlab_server/pull/259 + "ignore:metadata:DeprecationWarning", "ignore:There is no current event loop:DeprecationWarning", ] From 9b78e76564ac3d43baffdfde085b045c8629592e Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 20 Apr 2022 09:00:16 +0200 Subject: [PATCH 5/7] Revert "Add back filter warning" This reverts commit 3e1d4562c94f7ff7395ccc59c7b5cfe29bbb9ecf. --- pyproject.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 1f3b9bf532..83b90a2e61 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,7 +29,5 @@ timeout = 300 # timeout_method = "thread" filterwarnings = [ "error", - # Pending release of https://github.com/jupyterlab/jupyterlab_server/pull/259 - "ignore:metadata:DeprecationWarning", "ignore:There is no current event loop:DeprecationWarning", ] From ee49951f00861704cf3b1889e92151334af16ac5 Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 20 Apr 2022 09:04:56 +0200 Subject: [PATCH 6/7] Ensure jupyterlab_server>=2.13 --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index b44acf8f9f..eac256ffed 100644 --- a/setup.cfg +++ b/setup.cfg @@ -34,7 +34,7 @@ python_requires = >=3.7 install_requires = notebook_shim>=0.1,<0.2 jupyterlab>=4.0.0a23,<5 - jupyterlab_server>=2.11.1,<3 + jupyterlab_server>=2.13,<3 jupyter_server>=1.16.0,<2 tornado>=6.1.0 @@ -50,7 +50,7 @@ test = pytest-console-scripts ipykernel pre-commit - jupyterlab_server[test]>=2.11.1,<3 + jupyterlab_server[test]>=2.13,<3 [options.packages.find] exclude = From c5f24f787240a3f9e56fd120478bc106d0c2851b Mon Sep 17 00:00:00 2001 From: Jeremy Tuloup Date: Wed, 20 Apr 2022 09:31:42 +0200 Subject: [PATCH 7/7] Test on Python 3.10 --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b76d144030..fad3516555 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,8 @@ jobs: - name: Base Setup uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 + with: + python_version: "3.10" - name: Install the package run: |