From 79694b949cbd482b563cfcd2515f39eaa8ef6af7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 30 Oct 2023 11:41:35 -0300 Subject: [PATCH 01/11] python3-jsonschema: update to 4.19.2. --- srcpkgs/python3-jsonschema/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jsonschema/template b/srcpkgs/python3-jsonschema/template index 79ca06268c899..4cae7d0e5ad0f 100644 --- a/srcpkgs/python3-jsonschema/template +++ b/srcpkgs/python3-jsonschema/template @@ -1,7 +1,7 @@ # Template file for 'python3-jsonschema' pkgname=python3-jsonschema -version=4.19.1 -revision=2 +version=4.19.2 +revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-vcs" depends="python3-attrs python3-jsonschema-specifications" @@ -13,7 +13,7 @@ license="MIT" homepage="https://github.com/Julian/jsonschema" changelog="https://raw.githubusercontent.com/Julian/jsonschema/master/CHANGELOG.rst" distfiles="${PYPI_SITE}/j/jsonschema/jsonschema-${version}.tar.gz" -checksum=ec84cc37cfa703ef7cd4928db24f9cb31428a5d0fa77747b8b51a847458e0bbf +checksum=c9ff4d7447eed9592c23a12ccee508baf0dd0d59650615e847feb6cdca74f392 post_install() { vlicense COPYING LICENSE From 82d4fdeffad294e18325cec69cf72e4c1d618071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 25 Oct 2023 09:21:19 -0300 Subject: [PATCH 02/11] python3-traitlets: update to 5.13.0. --- srcpkgs/python3-traitlets/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template index f48119dadca32..3f418299ccf2f 100644 --- a/srcpkgs/python3-traitlets/template +++ b/srcpkgs/python3-traitlets/template @@ -1,8 +1,10 @@ # Template file for 'python3-traitlets' pkgname=python3-traitlets -version=5.11.2 +version=5.13.0 revision=1 build_style=python3-pep517 +# needs python3-pytest-mypy +make_check_args="--ignore tests/test_typing.py" hostmakedepends="hatchling" depends="python3" checkdepends="python3-argcomplete python3-pytest-mock" @@ -12,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=7564b5bf8d38c40fa45498072bf4dc5e8346eb087bbf1e2ae2d8774f6a0f078e +checksum=9b232b9430c8f57288c1024b34a8f0251ddcc47268927367a0dd3eeaca40deb5 post_install() { vlicense LICENSE From 6cecfd399ac8dd4a08b4596324aca7265191b4b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 11:29:47 -0300 Subject: [PATCH 03/11] python3-jupyter_core: update to 5.5.0. --- srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch | 4 ++-- srcpkgs/python3-jupyter_core/template | 4 ++-- srcpkgs/python3-jupyter_core/update | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch b/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch index 7f8a56d62bd96..76a1b063671d0 100644 --- a/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch +++ b/srcpkgs/python3-jupyter_core/patches/platform_dirs_true.patch @@ -11,8 +11,8 @@ Default to using platformdirs def get_home_dir() -> str: ---- a/jupyter_core/tests/test_paths.py 2020-02-01 21:00:00.000000000 -0300 -+++ b/jupyter_core/tests/test_paths.py 2023-06-04 00:49:05.967219753 -0300 +--- a/tests/test_paths.py 2020-02-01 21:00:00.000000000 -0300 ++++ b/tests/test_paths.py 2023-06-04 00:49:05.967219753 -0300 @@ -86,7 +86,7 @@ return os.path.abspath(os.path.realpath(os.path.expanduser(path))) diff --git a/srcpkgs/python3-jupyter_core/template b/srcpkgs/python3-jupyter_core/template index 57af2b9eff989..bb0ce3253a51a 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.3.1 +version=5.5.0 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=5ba5c7938a7f97a6b0481463f7ff0dbac7c15ba48cf46fa4035ca6e838aa1aba +checksum=880b86053bf298a8724994f95e99b99130659022a4f7f45f563084b6223861d3 conflicts="python-jupyter_core<=4.4.0_3" do_check() { diff --git a/srcpkgs/python3-jupyter_core/update b/srcpkgs/python3-jupyter_core/update index a42c0d0b9f127..25ef51d109a4f 100644 --- a/srcpkgs/python3-jupyter_core/update +++ b/srcpkgs/python3-jupyter_core/update @@ -1,4 +1 @@ ignore="*a* *b* *rc*" -# 5.3.2 breaks jupyter_client -# (https://github.com/jupyter/jupyter_core/pull/362) -ignore+=" 5.3.2" From addb7c63a7d045c5670490ae2d272004fc571b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 10:08:13 -0300 Subject: [PATCH 04/11] python3-jupyter_events: update to 0.8.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 4453d49c37034..79894a52e02b9 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.7.0 +version=0.8.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=7be27f54b8388c03eefea123a4f79247c5b9381c49fb1cd48615ee191eb12615 +checksum=fda08f0defce5e16930542ce60634ba48e010830d50073c3dfd235759cee77bf post_install() { vlicense LICENSE From b5e8a025bbe097fa1b53fad26e3b218dfaf43e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 10:09:21 -0300 Subject: [PATCH 05/11] python3-jupyter_client: update to 8.5.0. --- .../patches/972-utcnow-deprecation.patch | 149 ------------------ srcpkgs/python3-jupyter_client/template | 6 +- 2 files changed, 4 insertions(+), 151 deletions(-) delete mode 100644 srcpkgs/python3-jupyter_client/patches/972-utcnow-deprecation.patch diff --git a/srcpkgs/python3-jupyter_client/patches/972-utcnow-deprecation.patch b/srcpkgs/python3-jupyter_client/patches/972-utcnow-deprecation.patch deleted file mode 100644 index 47563fbed9ecf..0000000000000 --- a/srcpkgs/python3-jupyter_client/patches/972-utcnow-deprecation.patch +++ /dev/null @@ -1,149 +0,0 @@ -Taken from https://github.com/jupyter/jupyter_client/pull/972/ - -From 493366dd9e11736c32d32b1d84f5fa56d9ee74ab Mon Sep 17 00:00:00 2001 -From: Mattias Ellert -Date: Mon, 11 Sep 2023 06:37:16 +0200 -Subject: [PATCH 1/4] Do not use datetime.utcnow() that is deprecated in Python - 3.12 - -Import session.utcnow() into utils instead of reimplementing it ---- - jupyter_client/session.py | 2 +- - jupyter_client/utils.py | 34 +--------------------------------- - 2 files changed, 2 insertions(+), 34 deletions(-) - -diff --git a/jupyter_client/session.py b/jupyter_client/session.py -index ca9d9bbe..ee172d53 100644 ---- a/jupyter_client/session.py -+++ b/jupyter_client/session.py -@@ -197,7 +197,7 @@ def default_secure(cfg: t.Any) -> None: # pragma: no cover - - def utcnow() -> datetime: - """Return timezone-aware UTC timestamp""" -- return datetime.utcnow().replace(tzinfo=utc) # noqa -+ return datetime.now(utc) # noqa - - - # ----------------------------------------------------------------------------- -diff --git a/jupyter_client/utils.py b/jupyter_client/utils.py -index ab1cbcaa..4e2943c0 100644 ---- a/jupyter_client/utils.py -+++ b/jupyter_client/utils.py -@@ -4,10 +4,10 @@ - - vendor functions from ipython_genutils that should be retired at some point. - """ - import os --from datetime import datetime, timedelta, tzinfo - - from jupyter_core.utils import ensure_async, run_sync # noqa: F401 # noqa: F401 - -+from .session import utcnow - - def _filefind(filename, path_dirs=None): - """Find a file by looking through a sequence of paths. -@@ -84,35 +84,3 @@ def _expand_path(s): - if os.name == "nt": - s = s.replace("IPYTHON_TEMP", "$\\") - return s -- -- --# constant for zero offset --ZERO = timedelta(0) -- -- --class tzUTC(tzinfo): # noqa -- """tzinfo object for UTC (zero offset)""" -- -- def utcoffset(self, d): -- """Compute utcoffset.""" -- return ZERO -- -- def dst(self, d): -- """Compute dst.""" -- return ZERO -- -- --UTC = tzUTC() # type:ignore -- -- --def utc_aware(unaware): -- """decorator for adding UTC tzinfo to datetime's utcfoo methods""" -- -- def utc_method(*args, **kwargs): -- dt = unaware(*args, **kwargs) -- return dt.replace(tzinfo=UTC) -- -- return utc_method -- -- --utcnow = utc_aware(datetime.utcnow) - -From 5468546499f5071171bcb8bccafe034837cc092d Mon Sep 17 00:00:00 2001 -From: "pre-commit-ci[bot]" - <66853113+pre-commit-ci[bot]@users.noreply.github.com> -Date: Mon, 11 Sep 2023 04:44:48 +0000 -Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks - -for more information, see https://pre-commit.ci ---- - jupyter_client/utils.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/jupyter_client/utils.py b/jupyter_client/utils.py -index 4e2943c0..0186a001 100644 ---- a/jupyter_client/utils.py -+++ b/jupyter_client/utils.py -@@ -9,6 +9,7 @@ - - from .session import utcnow - -+ - def _filefind(filename, path_dirs=None): - """Find a file by looking through a sequence of paths. - - -From d78c153d819fb3da3dc80f916747291b5200a302 Mon Sep 17 00:00:00 2001 -From: David Brochart -Date: Mon, 11 Sep 2023 09:22:41 +0200 -Subject: [PATCH 3/4] Remove unneeded noqa - ---- - jupyter_client/session.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jupyter_client/session.py b/jupyter_client/session.py -index ee172d53..e22c9d44 100644 ---- a/jupyter_client/session.py -+++ b/jupyter_client/session.py -@@ -197,7 +197,7 @@ def default_secure(cfg: t.Any) -> None: # pragma: no cover - - def utcnow() -> datetime: - """Return timezone-aware UTC timestamp""" -- return datetime.now(utc) # noqa -+ return datetime.now(utc) - - - # ----------------------------------------------------------------------------- - -From 7ba40db1c6fb505e95df4cf4c3f9176661f2f270 Mon Sep 17 00:00:00 2001 -From: David Brochart -Date: Mon, 11 Sep 2023 09:22:57 +0200 -Subject: [PATCH 4/4] Add noqa - ---- - jupyter_client/utils.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/jupyter_client/utils.py b/jupyter_client/utils.py -index 0186a001..9f1c38e9 100644 ---- a/jupyter_client/utils.py -+++ b/jupyter_client/utils.py -@@ -7,7 +7,7 @@ - - from jupyter_core.utils import ensure_async, run_sync # noqa: F401 # noqa: F401 - --from .session import utcnow -+from .session import utcnow # noqa - - - def _filefind(filename, path_dirs=None): diff --git a/srcpkgs/python3-jupyter_client/template b/srcpkgs/python3-jupyter_client/template index 3484b2a96bec0..3e9b51cf396f7 100644 --- a/srcpkgs/python3-jupyter_client/template +++ b/srcpkgs/python3-jupyter_client/template @@ -1,8 +1,10 @@ # Template file for 'python3-jupyter_client' pkgname=python3-jupyter_client -version=8.3.1 +version=8.5.0 revision=1 build_style=python3-pep517 +# tests fail otherwise with jupyter_core 5.5.0 +make_check_args="-p no:unraisableexception" hostmakedepends="hatchling" depends="python3-dateutil python3-jupyter_core python3-pyzmq python3-tornado" checkdepends="$depends inetutils-ifconfig iproute2 openssh @@ -13,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=60294b2d5b869356c893f57b1a877ea6510d60d45cf4b38057f1672d85699ac9 +checksum=e8754066510ce456358df363f97eae64b50860f30dc1fe8c6771440db3be9a63 conflicts="python-jupyter_client<=5.2.4_2" make_check=extended # avoid a circular dependency From 2bb46b8883fb88f1bc272dd818168cd44e8559c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 30 Oct 2023 10:02:59 -0300 Subject: [PATCH 06/11] python3-ipython: update to 8.17.2. --- srcpkgs/python3-ipython/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-ipython/template b/srcpkgs/python3-ipython/template index 3d16ef86ed55b..a0a8b9149ad0b 100644 --- a/srcpkgs/python3-ipython/template +++ b/srcpkgs/python3-ipython/template @@ -1,6 +1,6 @@ # Template file for 'python3-ipython' pkgname=python3-ipython -version=8.16.1 +version=8.17.2 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" @@ -16,7 +16,7 @@ license="BSD-3-Clause" homepage="https://ipython.org/" changelog="https://github.com/ipython/ipython/raw/main/docs/source/whatsnew/version8.rst" distfiles="${PYPI_SITE}/i/ipython/ipython-${version}.tar.gz" -checksum=ad52f58fca8f9f848e256c629eff888efc0528c12fe0f8ec14f33205f23ef938 +checksum=126bb57e1895594bb0d91ea3090bbd39384f6fe87c3d57fd558d0670f50339bb conflicts="python-ipython<=5.8.0_2" make_check_pre="env PYTHONPATH=." From f2c76c947b397e342bb9c61c433a5b0651eaa2ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Wed, 25 Oct 2023 09:21:27 -0300 Subject: [PATCH 07/11] python3-ipython_ipykernel: update to 6.26.0. --- srcpkgs/python3-ipython_ipykernel/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template index 028b1aa989ba4..fcf924c5fe7a9 100644 --- a/srcpkgs/python3-ipython_ipykernel/template +++ b/srcpkgs/python3-ipython_ipykernel/template @@ -1,13 +1,13 @@ # Template file for 'python3-ipython_ipykernel' pkgname=python3-ipython_ipykernel -version=6.25.2 +version=6.26.0 revision=1 build_style=python3-pep517 -# these tests fail in 6.25.2 +# these tests fail in 6.26.0 make_check_args=" - --deselect ipykernel/tests/test_eventloop.py::test_asyncio_interrupt - --deselect ipykernel/tests/test_embed_kernel.py::test_embed_kernel_func - --deselect ipykernel/tests/test_kernelspec.py::test_install_kernelspec" + --deselect tests/test_eventloop.py::test_asyncio_interrupt + --deselect tests/test_embed_kernel.py::test_embed_kernel_func + --deselect tests/test_kernelspec.py::test_install_kernelspec" hostmakedepends="hatchling python3-jupyter_client" depends="python3-comm python3-ipython python3-jupyter_client python3-nest_asyncio python3-packaging python3-psutil python3-tornado" @@ -20,7 +20,7 @@ license="BSD-3-Clause" homepage="https://github.com/ipython/ipykernel" changelog="https://raw.githubusercontent.com/ipython/ipykernel/main/CHANGELOG.md" distfiles="${PYPI_SITE}/i/ipykernel/ipykernel-${version}.tar.gz" -checksum=f468ddd1f17acb48c8ce67fcfa49ba6d46d4f9ac0438c1f441be7c3d1372230b +checksum=553856658eb8430bbe9653ea041a41bff63e9606fc4628873fc92a6cf3abd404 if [ "$XBPS_CHECK_PKGS" = full ]; then # this would cause a build-time circular dependency @@ -28,8 +28,8 @@ if [ "$XBPS_CHECK_PKGS" = full ]; then else # These tests require ipyparallel make_check_args+=" - --ignore ipykernel/tests/test_pickleutil.py - --deselect ipykernel/tests/test_ipkernel_direct.py::test_do_apply + --ignore tests/test_pickleutil.py + --deselect tests/test_ipkernel_direct.py::test_do_apply " fi From e8b26bb82ec083639de18b4cce1ccd101e0b6294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 30 Oct 2023 10:02:54 -0300 Subject: [PATCH 08/11] python3-jupyter_nbconvert: update to 7.10.0. --- 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 a580377d0f03f..defa3f1c2ca9d 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.9.2 +version=7.10.0 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=e56cc7588acc4f93e2bb5a34ec69028e4941797b2bfaf6462f18a41d1cc258c9 +checksum=4bedff08848626be544de193b7594d98a048073f392178008ff4f171f5e21d26 pre_check() { # templates must be in $JUPYTER_DATA_DIR/nbconvert/templates From 06b5aad6a682a92648d6bda22d339cd7aaee7c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 10:16:08 -0300 Subject: [PATCH 09/11] jupyterlab: update to 4.0.7. --- srcpkgs/jupyterlab/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/jupyterlab/template b/srcpkgs/jupyterlab/template index 22b4a953e00c5..5f65995f04210 100644 --- a/srcpkgs/jupyterlab/template +++ b/srcpkgs/jupyterlab/template @@ -1,6 +1,6 @@ # Template file for 'jupyterlab' pkgname=jupyterlab -version=4.0.6 +version=4.0.7 revision=1 build_style=python3-pep517 hostmakedepends="hatchling hatch-jupyter-builder" @@ -13,7 +13,7 @@ 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=6c43ae5a6a1fd2fdfafcb3454004958bde6da76331abb44cffc6f9e436b19ba1 +checksum=48792efd9f962b2bcda1f87d72168ff122c288b1d97d32109e4a11b33dc862be post_install() { mv ${DESTDIR}/usr/etc ${DESTDIR} From 48453b5307e0e817381866904c9f5db06f9ac712 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 10:09:47 -0300 Subject: [PATCH 10/11] python3-jupyter_notebook: update to 7.0.6. --- srcpkgs/python3-jupyter_notebook/template | 4 ++-- srcpkgs/python3-jupyter_notebook/update | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/python3-jupyter_notebook/template b/srcpkgs/python3-jupyter_notebook/template index 1d13333d6ad3b..77f03d0e886d5 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.4 +version=7.0.6 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=0c1b458f72ce8774445c8ef9ed2492bd0b9ce9605ac996e2b066114f69795e71 +checksum=ec6113b06529019f7f287819af06c97a2baf7a95ac21a8f6e32192898e9f9a58 post_install() { mv ${DESTDIR}/usr/etc ${DESTDIR} diff --git a/srcpkgs/python3-jupyter_notebook/update b/srcpkgs/python3-jupyter_notebook/update index 276c9bf787e58..1bb284fed4967 100644 --- a/srcpkgs/python3-jupyter_notebook/update +++ b/srcpkgs/python3-jupyter_notebook/update @@ -1,2 +1,2 @@ pkgname=notebook -#ignore="*a* *b* *rc*" +ignore="*a* *b* *rc*" From f8123f30b94c7f9e2c1bd67a788fa6bc1fcf34af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 10:14:46 -0300 Subject: [PATCH 11/11] python3-jupyter_server: update to 2.9.1. --- .../patches/utcnow-deprecation.patch | 24 ++++++++++++------- srcpkgs/python3-jupyter_server/template | 11 ++++++--- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/srcpkgs/python3-jupyter_server/patches/utcnow-deprecation.patch b/srcpkgs/python3-jupyter_server/patches/utcnow-deprecation.patch index e5f7a2af5b335..7a69b8f834e49 100644 --- a/srcpkgs/python3-jupyter_server/patches/utcnow-deprecation.patch +++ b/srcpkgs/python3-jupyter_server/patches/utcnow-deprecation.patch @@ -1,17 +1,25 @@ -See: https://github.com/jupyter-server/jupyter_server/issues/1296#issuecomment-1751887150 +commit 13def167faf8898b2e19fc04f24c0ff6f6cc35fa +Author: Gonzalo Tornaría +Date: Mon Oct 16 10:38:36 2023 -0300 + utcnow deprecation + + See: https://github.com/jupyter-server/jupyter_server/issues/1296#issuecomment-1751887150 + +diff --git a/jupyter_server/_tz.py b/jupyter_server/_tz.py +index 24847b430..ea3e65fe2 100644 --- a/jupyter_server/_tz.py +++ b/jupyter_server/_tz.py -@@ -5,7 +5,7 @@ Just UTC-awareness right now - """ - # Copyright (c) Jupyter Development Team. +@@ -7,7 +7,7 @@ Just UTC-awareness right now # Distributed under the terms of the Modified BSD License. + from __future__ import annotations + -from datetime import datetime, timedelta, tzinfo +from datetime import datetime, timedelta, tzinfo, timezone + from typing import Callable # constant for zero offset - ZERO = timedelta(0) -@@ -39,6 +39,12 @@ def utc_aware(unaware): +@@ -42,6 +42,12 @@ def utc_aware(unaware: Callable[..., datetime]) -> Callable[..., datetime]: utcfromtimestamp = utc_aware(datetime.utcfromtimestamp) utcnow = utc_aware(datetime.utcnow) @@ -22,10 +30,10 @@ See: https://github.com/jupyter-server/jupyter_server/issues/1296#issuecomment-1 +def utcfromtimestamp(timestamp): + return datetime.fromtimestamp(timestamp, timezone.utc) - def isoformat(dt): + def isoformat(dt: datetime) -> str: """Return iso-formatted timestamp diff --git a/tests/test_gateway.py b/tests/test_gateway.py -index 8f7f8a463..598006e29 100644 +index 37ce8b03e..e1ea0869e 100644 --- a/tests/test_gateway.py +++ b/tests/test_gateway.py @@ -78,7 +78,7 @@ omitted_kernels: Dict[str, bool] = {} diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template index b0bd9f2f758bc..f38ab9ed7eef6 100644 --- a/srcpkgs/python3-jupyter_server/template +++ b/srcpkgs/python3-jupyter_server/template @@ -1,8 +1,13 @@ # Template file for 'python3-jupyter_server' pkgname=python3-jupyter_server -version=2.7.3 +version=2.9.1 revision=1 build_style=python3-pep517 +# these tests are flaky with jupyter_core 5.5.0 +make_check_args=" + --deselect=tests/services/kernels/test_api.py::test_connection[jp_server_config0] + --deselect=tests/services/sessions/test_api.py::test_restart_kernel[jp_server_config0] +" hostmakedepends="hatchling hatch-jupyter-builder" depends="python3-anyio python3-argon2 python3-jupyter_client python3-jupyter_events python3-jupyter_nbconvert @@ -18,11 +23,11 @@ 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=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649 +checksum=9ba71be4b9c16e479e4c50c929f8ac4b1015baf90237a08681397a98c76c7e5e if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then # these tests fail on CI (connect to a tcp address) - make_check_args=" + make_check_args+=" --deselect=tests/extension/test_launch.py::test_launch_instance --deselect=tests/extension/test_launch.py::test_base_url --deselect=tests/extension/test_launch.py::test_token_file