From f286a70fc9bfabbbe7667207b4b0cbc5eb5f4850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 5 Feb 2024 18:18:03 -0300 Subject: [PATCH 01/18] hatchling: update to 1.22.3. --- srcpkgs/hatchling/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hatchling/template b/srcpkgs/hatchling/template index ec436c4a02119b..7e79add687b886 100644 --- a/srcpkgs/hatchling/template +++ b/srcpkgs/hatchling/template @@ -1,6 +1,6 @@ # Template file for 'hatchling' pkgname=hatchling -version=1.21.0 +version=1.22.3 revision=1 build_style=python3-pep517 _deps="python3-editables python3-packaging python3-pathspec python3-pluggy @@ -13,7 +13,7 @@ license="MIT" homepage="https://hatch.pypa.io/latest/" changelog="https://raw.githubusercontent.com/pypa/hatch/master/docs/history/hatchling.md" distfiles="${PYPI_SITE}/h/hatchling/hatchling-${version}.tar.gz" -checksum=5c086772357a50723b825fd5da5278ac7e3697cdf7797d07541a6c90b6ff754c +checksum=adf5d32ab10ac59272cd0bcae9c8193288841860025f2c51df971dae161f8683 post_install() { vlicense LICENSE.txt From 7823e61d548460abcc82c34888b1d00f4e664842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:02:18 -0300 Subject: [PATCH 02/18] hatch-jupyter-builder: update to 0.9.1. --- srcpkgs/hatch-jupyter-builder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/hatch-jupyter-builder/template b/srcpkgs/hatch-jupyter-builder/template index ea2a207a220917..af3ea922f75e53 100644 --- a/srcpkgs/hatch-jupyter-builder/template +++ b/srcpkgs/hatch-jupyter-builder/template @@ -1,7 +1,7 @@ # Template file for 'hatch-jupyter-builder' pkgname=hatch-jupyter-builder -version=0.8.3 -revision=2 +version=0.9.1 +revision=1 build_style=python3-pep517 hostmakedepends="hatchling" depends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyterlab/hatch-jupyter-builder" changelog="https://raw.githubusercontent.com/jupyterlab/hatch-jupyter-builder/main/CHANGELOG.md" distfiles="https://github.com/jupyterlab/hatch-jupyter-builder/archive/refs/tags/v${version}.tar.gz" -checksum=b167709e9bd196b3b92fe13a20b10c09cd30ca550759a9f06834378eb371af96 +checksum=c948ea9ffa939916814465eee00af58b713a119eca202565382306b689d6f14c post_install() { vlicense LICENSE.txt From 61853bad0a3f2a26f53d35a615be08fa7daab280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:30 -0300 Subject: [PATCH 03/18] python3-traitlets: update to 5.14.2. --- srcpkgs/python3-traitlets/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template index 55d34c0507f78a..69b8c446c70cad 100644 --- a/srcpkgs/python3-traitlets/template +++ b/srcpkgs/python3-traitlets/template @@ -1,6 +1,6 @@ # Template file for 'python3-traitlets' pkgname=python3-traitlets -version=5.14.1 +version=5.14.2 revision=1 build_style=python3-pep517 # needs python3-pytest-mypy @@ -14,7 +14,7 @@ license="BSD-3-Clause" homepage="https://github.com/ipython/traitlets" changelog="https://raw.githubusercontent.com/ipython/traitlets/main/CHANGELOG.md" distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz" -checksum=8585105b371a04b8316a43d5ce29c098575c2e477850b62b848b964f1444527e +checksum=8cdd83c040dab7d1dee822678e5f5d100b514f7b72b01615b26fc5718916fdf9 post_install() { vlicense LICENSE From 681ff7575e2cdd502096b061b9d7c6c3eddbdf72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:24 -0300 Subject: [PATCH 04/18] python3-jupyter_core: update to 5.7.2. --- srcpkgs/python3-jupyter_core/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template index acc52e6f1a689d..f229a3adb66b14 100644 --- a/srcpkgs/python3-jupyter_core/template +++ b/srcpkgs/python3-jupyter_core/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_core' pkgname=python3-jupyter_core -version=5.7.1 +version=5.7.2 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://jupyter.org" changelog="https://raw.githubusercontent.com/jupyter/jupyter_core/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter_core/jupyter_core-${version}.tar.gz" -checksum=de61a9d7fc71240f688b2fb5ab659fbb56979458dc66a71decd098e03c79e218 +checksum=aa5f8d32bbf6b431ac830496da7392035d6f61b4f54872f15c4bd2a9c3f536d9 conflicts="python-jupyter_core<=4.4.0_3" do_check() { From aeec22fa869d7a0ffffa41e08323d8f884469e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 21 Feb 2024 20:48:34 -0300 Subject: [PATCH 05/18] python3-pytest-jupyter: update to 0.9.1. --- srcpkgs/python3-pytest-jupyter/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pytest-jupyter/template b/srcpkgs/python3-pytest-jupyter/template index 495ebf4df85a4b..3b9190e857773e 100644 --- a/srcpkgs/python3-pytest-jupyter/template +++ b/srcpkgs/python3-pytest-jupyter/template @@ -1,6 +1,6 @@ # Template file for 'python3-pytest-jupyter' pkgname=python3-pytest-jupyter -version=0.8.0 +version=0.9.1 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter-server/pytest-jupyter" changelog="https://raw.githubusercontent.com/jupyter-server/pytest-jupyter/main/CHANGELOG.md" distfiles="${PYPI_SITE}/p/pytest_jupyter/pytest_jupyter-${version}.tar.gz" -checksum=842817c300802c8608676bbb1460ba0081f2688cf5cb55b87d7bad5dcb0e9729 +checksum=f11db2bc390bd8e1090e36b6295c2d80b84e014f13b778e3ca0f8685c7d64379 make_check=extended # cannot be tested without python3-jupyter_server if [ "$XBPS_CHECK_PKGS" = full ]; then From d70534060a8e1cd2ffb84240688ea615e0f364a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:23 -0300 Subject: [PATCH 06/18] python3-jupyter_client: update to 8.6.1. --- srcpkgs/python3-jupyter_client/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template index c755680e49da07..32f5e7baee95db 100644 --- a/srcpkgs/python3-jupyter_client/template +++ b/srcpkgs/python3-jupyter_client/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_client' pkgname=python3-jupyter_client -version=8.6.0 +version=8.6.1 revision=1 build_style=python3-pep517 # tests fail otherwise with jupyter_core 5.5.0 @@ -15,7 +15,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter/jupyter_client" changelog="https://raw.githubusercontent.com/jupyter/jupyter_client/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter_client/jupyter_client-${version}.tar.gz" -checksum=0642244bb83b4764ae60d07e010e15f0e2d275ec4e918a8f7b80fbbef3ca60c7 +checksum=e842515e2bab8e19186d89fdfea7abd15e39dd581f94e399f00e2af5a1652d3f conflicts="python-jupyter_client<=5.2.4_2" make_check=extended # cannot be tested without python3-ipython_ipykernel From 07b89ed04f04eec7d02465e843fc820ef88fa929 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:25 -0300 Subject: [PATCH 07/18] python3-jupyter_events: update to 0.10.0. --- srcpkgs/python3-jupyter_events/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_events/template b/srcpkgs/python3-jupyter_events/template index 2424850a438e2c..1675c6e34df546 100644 --- a/srcpkgs/python3-jupyter_events/template +++ b/srcpkgs/python3-jupyter_events/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_events' pkgname=python3-jupyter_events -version=0.9.0 +version=0.10.0 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter/jupyter_events" changelog="https://raw.githubusercontent.com/jupyter/jupyter_events/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter_events/jupyter_events-${version}.tar.gz" -checksum=81ad2e4bc710881ec274d31c6c50669d71bbaa5dd9d01e600b56faa85700d399 +checksum=670b8229d3cc882ec782144ed22e0d29e1c2d639263f92ca8383e66682845e22 post_install() { vlicense LICENSE From c6ed725ffbef6605ab6302afe5bb6c33a46b2184 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 15 Feb 2024 09:09:55 -0300 Subject: [PATCH 08/18] python3-jupyter_widgetsnbextension: update to 4.0.10. --- srcpkgs/python3-jupyter_widgetsnbextension/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_widgetsnbextension/template b/srcpkgs/python3-jupyter_widgetsnbextension/template index 6015ea6e8d69a5..dfaf1052740c54 100644 --- a/srcpkgs/python3-jupyter_widgetsnbextension/template +++ b/srcpkgs/python3-jupyter_widgetsnbextension/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_widgetsnbextension' pkgname=python3-jupyter_widgetsnbextension -version=4.0.9 +version=4.0.10 revision=1 build_style=python3-pep517 hostmakedepends="python3-jupyter_packaging" @@ -9,7 +9,7 @@ maintainer="Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://pypi.org/project/widgetsnbextension/" distfiles="${PYPI_SITE}/w/widgetsnbextension/widgetsnbextension-${version}.tar.gz" -checksum=3c1f5e46dc1166dfd40a42d685e6a51396fd34ff878742a3e47c6f0cc4a2a385 +checksum=64196c5ff3b9a9183a8e699a4227fb0b7002f252c814098e66c4d1cd0644688f make_check=no # Upstream defines no tests post_install() { From 7328bdc1a9eaaf064c93baa322fcfd50d6f0ab82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 15 Feb 2024 09:09:54 -0300 Subject: [PATCH 09/18] python3-jupyter_ipywidgets: update to 8.1.2. --- srcpkgs/python3-jupyter_ipywidgets/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jupyter_ipywidgets/template b/srcpkgs/python3-jupyter_ipywidgets/template index fb63dac1a88ff9..f0f9d4e8f46d79 100644 --- a/srcpkgs/python3-jupyter_ipywidgets/template +++ b/srcpkgs/python3-jupyter_ipywidgets/template @@ -1,7 +1,7 @@ # Template file for 'python3-jupyter_ipywidgets' pkgname=python3-jupyter_ipywidgets -version=8.1.1 -revision=2 +version=8.1.2 +revision=1 build_style=python3-pep517 hostmakedepends="python3-wheel" depends="python3-ipython_ipykernel python3-jupyter_widgetsnbextension" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter-widgets/ipywidgets" changelog="https://raw.githubusercontent.com/jupyter-widgets/ipywidgets/main/docs/source/changelog.md" distfiles="${PYPI_SITE}/i/ipywidgets/ipywidgets-${version}.tar.gz" -checksum=40211efb556adec6fa450ccc2a77d59ca44a060f4f9f136833df59c9f538e6e8 +checksum=d0b9b41e49bae926a866e613a39b0f0097745d2b9f1f3dd406641b4a57ec42c9 post_install() { vlicense LICENSE From 18a9e3f68ce430602e1e45ab09a04a7c0d15e92b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:26 -0300 Subject: [PATCH 10/18] python3-jupyter_nbformat: update to 5.10.3. --- srcpkgs/python3-jupyter_nbformat/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_nbformat/template b/srcpkgs/python3-jupyter_nbformat/template index 357d1053e002ab..396a57c592e6d4 100644 --- a/srcpkgs/python3-jupyter_nbformat/template +++ b/srcpkgs/python3-jupyter_nbformat/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_nbformat' pkgname=python3-jupyter_nbformat -version=5.9.2 +version=5.10.3 revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-nodejs-version" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter/nbformat" changelog="https://raw.githubusercontent.com/jupyter/nbformat/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbformat/nbformat-${version}.tar.gz" -checksum=5f98b5ba1997dff175e77e0c17d5c10a96eaed2cbd1de3533d1fc35d5e111192 +checksum=60ed5e910ef7c6264b87d644f276b1b49e24011930deef54605188ddeb211685 conflicts="python-jupyter_nbformat<=4.4.0_3" post_install() { From 6fd1ac4c8cedce31f72858fd17eb0987ad117138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:29 -0300 Subject: [PATCH 11/18] python3-nbclient: update to 0.10.0. --- srcpkgs/python3-nbclient/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-nbclient/template b/srcpkgs/python3-nbclient/template index be2ca98d3ec9a8..684d01548a6389 100644 --- a/srcpkgs/python3-nbclient/template +++ b/srcpkgs/python3-nbclient/template @@ -1,6 +1,6 @@ # Template file for 'python3-nbclient' pkgname=python3-nbclient -version=0.9.0 +version=0.10.0 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -8,12 +8,12 @@ depends="python3-jupyter_client python3-jupyter_nbformat" checkdepends="$depends python3-pytest-asyncio python3-testpath python3-flaky python3-jupyter_ipywidgets python3-xmltodict" short_desc="Client library for executing Jupyter notebooks" -maintainer="dkwo " +maintainer="dkwo , Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://nbclient.readthedocs.io/en/latest/" changelog="https://raw.githubusercontent.com/jupyter/nbclient/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbclient/nbclient-${version}.tar.gz" -checksum=4b28c207877cf33ef3a9838cdc7a54c5ceff981194a82eac59d558f05487295e +checksum=4b3f1b7dba531e498449c4db4f53da339c91d449dc11e9af3a43b4eb5c5abb09 make_check=extended # avoid a circular dependency if [ "$XBPS_CHECK_PKGS" = full ]; then From 93ce1658ca8992bbb18a2449954ee9d9afa25c36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 6 Feb 2024 10:57:50 -0300 Subject: [PATCH 12/18] python3-jupyter_nbconvert: update to 7.16.2. --- srcpkgs/python3-jupyter_nbconvert/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_nbconvert/template b/srcpkgs/python3-jupyter_nbconvert/template index 199bed00cb9824..5f9e7872fb1079 100644 --- a/srcpkgs/python3-jupyter_nbconvert/template +++ b/srcpkgs/python3-jupyter_nbconvert/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_nbconvert' pkgname=python3-jupyter_nbconvert -version=7.14.2 +version=7.16.2 revision=1 build_style=python3-pep517 # these two tests require nbconvert.tests (not installed) @@ -19,7 +19,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter/nbconvert" changelog="https://raw.githubusercontent.com/jupyter/nbconvert/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/nbconvert/nbconvert-${version}.tar.gz" -checksum=a7f8808fd4e082431673ac538400218dd45efd076fbeb07cc6e5aa5a3a4e949e +checksum=8310edd41e1c43947e4ecf16614c61469ebc024898eb808cce0999860fc9fb16 pre_check() { # templates must be in $JUPYTER_DATA_DIR/nbconvert/templates From d1a07aab403bdb1c6c79d0a43d41c31782157127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Sun, 17 Mar 2024 23:36:27 -0300 Subject: [PATCH 13/18] python3-jupyter_server_terminals: update to 0.5.3. --- srcpkgs/python3-jupyter_server_terminals/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_server_terminals/template b/srcpkgs/python3-jupyter_server_terminals/template index a1bc70ce052183..b12507d3152f80 100644 --- a/srcpkgs/python3-jupyter_server_terminals/template +++ b/srcpkgs/python3-jupyter_server_terminals/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_server_terminals' pkgname=python3-jupyter_server_terminals -version=0.5.2 +version=0.5.3 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -12,7 +12,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter-server/jupyter_server_terminals" changelog="https://raw.githubusercontent.com/jupyter-server/jupyter_server_terminals/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter_server_terminals/jupyter_server_terminals-${version}.tar.gz" -checksum=396b5ccc0881e550bf0ee7012c6ef1b53edbde69e67cab1d56e89711b46052e8 +checksum=5ae0295167220e9ace0edcfdb212afd2b01ee8d179fe6f23c899590e9b8a5269 make_check=extended # avoid a circular dependency if [ "$XBPS_CHECK_PKGS" = full ]; then From 516601d7e13b3ceb640f0e2e79ae53b55796ca32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 4 Mar 2024 11:54:36 -0300 Subject: [PATCH 14/18] python3-jupyter_server: update to 2.13.0. --- srcpkgs/python3-jupyter_server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template index 155851e75f7bf4..04eb5ad9c04253 100644 --- a/srcpkgs/python3-jupyter_server/template +++ b/srcpkgs/python3-jupyter_server/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_server' pkgname=python3-jupyter_server -version=2.12.5 +version=2.13.0 revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-jupyter-builder" @@ -18,7 +18,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter-server/jupyter_server" changelog="https://raw.githubusercontent.com/jupyter-server/jupyter_server/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyter-server/jupyter_server-${version}.tar.gz" -checksum=0edb626c94baa22809be1323f9770cf1c00a952b17097592e40d03e6a3951689 +checksum=c80bfb049ea20053c3d9641c2add4848b38073bf79f1729cea1faed32fc1c78e if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then # these tests fail on CI (connect to a tcp address) From 507c95e8b476a8dfa6f70348fc58ba84f23657a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 15 Feb 2024 09:09:56 -0300 Subject: [PATCH 15/18] python3-jupyterlab_server: update to 2.25.4. --- .../patches/openapi-core.patch | 48 +++++++++++++++++++ srcpkgs/python3-jupyterlab_server/template | 6 +-- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch diff --git a/srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch b/srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch new file mode 100644 index 00000000000000..06a6ff866a530d --- /dev/null +++ b/srcpkgs/python3-jupyterlab_server/patches/openapi-core.patch @@ -0,0 +1,48 @@ +diff --git a/jupyterlab_server/spec.py b/jupyterlab_server/spec.py +index 94347b9..88b9c3e 100644 +--- a/jupyterlab_server/spec.py ++++ b/jupyterlab_server/spec.py +@@ -9,17 +9,17 @@ import typing + from pathlib import Path + + if typing.TYPE_CHECKING: +- from openapi_core.spec.paths import Spec ++ from jsonschema_path import SchemaPath + + HERE = Path(os.path.dirname(__file__)).resolve() + + +-def get_openapi_spec() -> Spec: ++def get_openapi_spec() -> SchemaPath: + """Get the OpenAPI spec object.""" +- from openapi_core.spec.paths import Spec ++ from jsonschema_path import SchemaPath + + openapi_spec_dict = get_openapi_spec_dict() +- return Spec.from_dict(openapi_spec_dict) # type:ignore[arg-type] ++ return SchemaPath.from_dict(openapi_spec_dict) # type:ignore[arg-type] + + + def get_openapi_spec_dict() -> dict[str, typing.Any]: +diff --git a/jupyterlab_server/test_utils.py b/jupyterlab_server/test_utils.py +index c1d8956..bf22e80 100644 +--- a/jupyterlab_server/test_utils.py ++++ b/jupyterlab_server/test_utils.py +@@ -14,7 +14,7 @@ from urllib.parse import parse_qs, urlparse + import tornado.httpclient + import tornado.web + from openapi_core import V30RequestValidator, V30ResponseValidator +-from openapi_core.spec.paths import Spec ++from jsonschema_path import SchemaPath + from openapi_core.validation.request.datatypes import RequestParameters + from tornado.httpclient import HTTPRequest, HTTPResponse + from werkzeug.datastructures import Headers, ImmutableMultiDict +@@ -32,7 +32,7 @@ class TornadoOpenAPIRequest: + Converts a torando request to an OpenAPI one + """ + +- def __init__(self, request: HTTPRequest, spec: Spec): ++ def __init__(self, request: HTTPRequest, spec: SchemaPath): + """Initialize the request.""" + self.request = request + self.spec = spec diff --git a/srcpkgs/python3-jupyterlab_server/template b/srcpkgs/python3-jupyterlab_server/template index 770a2fb33e8087..92e7585d5ba27c 100644 --- a/srcpkgs/python3-jupyterlab_server/template +++ b/srcpkgs/python3-jupyterlab_server/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyterlab_server' pkgname=python3-jupyterlab_server -version=2.25.2 +version=2.25.4 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" @@ -8,12 +8,12 @@ depends="python3-jupyter_server python3-Babel python3-json5 python3-requests" checkdepends="$depends python3-pytest-jupyter python3-openapi-core python3-requests-mock python3-strict-rfc3339 python3-ruamel.yaml python3-pip" short_desc="Server components for JupyterLab and JL-like applications" -maintainer="dkwo " +maintainer="dkwo , Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/jupyterlab/jupyterlab_server" changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab_server/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyterlab_server/jupyterlab_server-${version}.tar.gz" -checksum=bd0ec7a99ebcedc8bcff939ef86e52c378e44c2707e053fcd81d046ce979ee63 +checksum=2098198e1e82e0db982440f9b5136175d73bea2cd42a6480aa6fd502cb23c4f9 if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then # tests setup fails on CI (no idea why) From d94142f628694c6108e82d5c57cab6e247b8d7f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 15 Feb 2024 09:09:57 -0300 Subject: [PATCH 16/18] python3-notebook_shim: update to 0.2.4. --- srcpkgs/python3-notebook_shim/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-notebook_shim/template b/srcpkgs/python3-notebook_shim/template index c1e58a8e8159a4..fd75b010d179b6 100644 --- a/srcpkgs/python3-notebook_shim/template +++ b/srcpkgs/python3-notebook_shim/template @@ -1,18 +1,18 @@ # Template file for 'python3-notebook_shim' pkgname=python3-notebook_shim -version=0.2.3 +version=0.2.4 revision=1 build_style=python3-pep517 hostmakedepends="hatchling" depends="python3-jupyter_server" checkdepends="$depends python3-pytest-jupyter" short_desc="Shim layer for notebook traits and config" -maintainer="dkwo " +maintainer="dkwo , Gonzalo Tornaría " license="BSD-3-Clause" homepage="https://github.com/jupyter/notebook_shim" changelog="https://raw.githubusercontent.com/jupyter/notebook_shim/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/notebook_shim/notebook_shim-${version}.tar.gz" -checksum=f69388ac283ae008cd506dda10d0288b09a017d822d5e8c7129a152cbd3ce7e9 +checksum=b4b2cfa1b65d98307ca24361f5b30fe785b53c3fd07b7a47e89acb5e6ac638cb post_install() { mv ${DESTDIR}/usr/etc ${DESTDIR} From fa8f5677b7a2761aaa3f8fccea1a271c144cd2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 5 Feb 2024 18:07:46 -0300 Subject: [PATCH 17/18] jupyterlab: update to 4.1.5. --- srcpkgs/jupyterlab/template | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template index c44ef72f402cda..fe3d2cb0775495 100644 --- a/srcpkgs/jupyterlab/template +++ b/srcpkgs/jupyterlab/template @@ -1,11 +1,11 @@ # Template file for 'jupyterlab' pkgname=jupyterlab -version=4.0.12 +version=4.1.5 revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-jupyter-builder" -depends="nodejs python3-async-lru python3-ipython_ipykernel - python3-jupyterlab_server python3-notebook_shim python3-tomli" +depends="nodejs python3-async-lru python3-httpx python3-ipython_ipykernel + python3-jupyterlab_server python3-notebook_shim" checkdepends="$depends python3-pytest-jupyter python3-pytest-xdist" short_desc="JupyterLab computational environment" maintainer="dkwo , Gonzalo Tornaría " @@ -13,7 +13,14 @@ license="custom:jupyterlab" homepage="https://github.com/jupyterlab/jupyterlab/" changelog="https://raw.githubusercontent.com/jupyterlab/jupyterlab/main/CHANGELOG.md" distfiles="${PYPI_SITE}/j/jupyterlab/jupyterlab-${version}.tar.gz" -checksum=965d92efa82a538ed70ccb3968d9aabba788840da882e13d7b061780cdedc3b7 +checksum=c9ad75290cb10bfaff3624bf3fbb852319b4cce4c456613f8ebbaa98d03524db + +if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then + # this test fails on CI (network timeout) + make_check_args=" + --deselect=jupyterlab/tests/test_build_api.py::TestBuildAPI + " +fi post_install() { mv ${DESTDIR}/usr/etc ${DESTDIR} From 0962508d102b25c44d06e5fe62e4a26a7e00f382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Thu, 15 Feb 2024 09:09:55 -0300 Subject: [PATCH 18/18] python3-jupyter_notebook: update to 7.1.2. --- srcpkgs/python3-jupyter_notebook/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template index 78b9705a260046..144a5b83b27a71 100644 --- a/srcpkgs/python3-jupyter_notebook/template +++ b/srcpkgs/python3-jupyter_notebook/template @@ -1,6 +1,6 @@ # Template file for 'python3-jupyter_notebook' pkgname=python3-jupyter_notebook -version=7.0.7 +version=7.1.2 revision=1 build_style=python3-pep517 make_build_args="--skip-dependency-check" @@ -13,7 +13,7 @@ license="BSD-3-Clause" homepage="https://github.com/jupyter/notebook" changelog="https://raw.githubusercontent.com/jupyter/notebook/main/CHANGELOG.md" distfiles="${PYPI_SITE}/n/notebook/notebook-${version}.tar.gz" -checksum=3bcff00c17b3ac142ef5f436d50637d936b274cfa0b41f6ac0175363de9b4e09 +checksum=efc2c80043909e0faa17fce9e9b37c059c03af0ec99a4d4db84cb21d9d2e936a post_install() { mv ${DESTDIR}/usr/etc ${DESTDIR}