* [PR PATCH] A few jupyter (minor) updates
@ 2023-10-20 0:25 tornaria
2023-10-20 1:36 ` [PR PATCH] [Updated] " tornaria
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: tornaria @ 2023-10-20 0:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 14569 bytes --]
From 8931cef65699e91057c2e84738cfd3954c4f15c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 11:29:47 -0300
Subject: [PATCH 1/6] python3-jupyter_core: ignore broken release
---
srcpkgs/python3-jupyter_core/update | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-jupyter_core/update b/srcpkgs/python3-jupyter_core/update
index a42c0d0b9f127..809418a111ea4 100644
--- a/srcpkgs/python3-jupyter_core/update
+++ b/srcpkgs/python3-jupyter_core/update
@@ -1,4 +1,4 @@
ignore="*a* *b* *rc*"
-# 5.3.2 breaks jupyter_client
-# (https://github.com/jupyter/jupyter_core/pull/362)
-ignore+=" 5.3.2"
+# 5.3.2 and 5.4.0 break jupyter_client
+# https://github.com/jupyter/jupyter_client/issues/979
+ignore+=" 5.3.2 5.4.0"
From 96931e31d8fc8405e54449fe5c8a242e1405cc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:08:13 -0300
Subject: [PATCH 2/6] 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 a71100bc879f1e847c4214379bb2792a1e789b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:21 -0300
Subject: [PATCH 3/6] python3-jupyter_client: update to 8.4.0.
---
.../patches/972-utcnow-deprecation.patch | 149 ------------------
srcpkgs/python3-jupyter_client/template | 4 +-
2 files changed, 2 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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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..de3dc9493ecf7 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.3.1
+version=8.4.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
@@ -13,7 +13,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=dc1b857d5d7d76ac101766c6e9b646bf18742721126e72e5d484c75a993cada2
conflicts="python-jupyter_client<=5.2.4_2"
make_check=extended # avoid a circular dependency
From f52cd78d6f7c3d8462f5cc338a6d5df0d6104cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:16:08 -0300
Subject: [PATCH 4/6] 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 58e4fe023a32398a0acacb3ca3e9ce6b3f4c4faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:47 -0300
Subject: [PATCH 5/6] 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 08d6ab8d7838b21c67fab62d81861cdd0bea0f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:14:46 -0300
Subject: [PATCH 6/6] python3-jupyter_server: update to 2.8.0.
---
.../patches/utcnow-deprecation.patch | 24 ++++++++++++-------
srcpkgs/python3-jupyter_server/template | 4 ++--
2 files changed, 18 insertions(+), 10 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 <tornaria@cmat.edu.uy>
+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..ac99db62645e9 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.7.3
+version=2.8.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=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649
+checksum=b11e2ba80667c75f55630faf8ac3d5809f8734f9006d65cce117c46a0a516ab8
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (connect to a tcp address)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
@ 2023-10-20 1:36 ` tornaria
2023-10-20 1:44 ` tornaria
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-20 1:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 14569 bytes --]
From 8931cef65699e91057c2e84738cfd3954c4f15c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 11:29:47 -0300
Subject: [PATCH 1/6] python3-jupyter_core: ignore broken release
---
srcpkgs/python3-jupyter_core/update | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-jupyter_core/update b/srcpkgs/python3-jupyter_core/update
index a42c0d0b9f127..809418a111ea4 100644
--- a/srcpkgs/python3-jupyter_core/update
+++ b/srcpkgs/python3-jupyter_core/update
@@ -1,4 +1,4 @@
ignore="*a* *b* *rc*"
-# 5.3.2 breaks jupyter_client
-# (https://github.com/jupyter/jupyter_core/pull/362)
-ignore+=" 5.3.2"
+# 5.3.2 and 5.4.0 break jupyter_client
+# https://github.com/jupyter/jupyter_client/issues/979
+ignore+=" 5.3.2 5.4.0"
From 96931e31d8fc8405e54449fe5c8a242e1405cc1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:08:13 -0300
Subject: [PATCH 2/6] 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 a71100bc879f1e847c4214379bb2792a1e789b2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:21 -0300
Subject: [PATCH 3/6] python3-jupyter_client: update to 8.4.0.
---
.../patches/972-utcnow-deprecation.patch | 149 ------------------
srcpkgs/python3-jupyter_client/template | 4 +-
2 files changed, 2 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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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..de3dc9493ecf7 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.3.1
+version=8.4.0
revision=1
build_style=python3-pep517
hostmakedepends="hatchling"
@@ -13,7 +13,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=dc1b857d5d7d76ac101766c6e9b646bf18742721126e72e5d484c75a993cada2
conflicts="python-jupyter_client<=5.2.4_2"
make_check=extended # avoid a circular dependency
From f52cd78d6f7c3d8462f5cc338a6d5df0d6104cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:16:08 -0300
Subject: [PATCH 4/6] 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 58e4fe023a32398a0acacb3ca3e9ce6b3f4c4faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:47 -0300
Subject: [PATCH 5/6] 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 4be0e860a87d50216beb4a48668a91cad6e66db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:14:46 -0300
Subject: [PATCH 6/6] python3-jupyter_server: update to 2.8.0.
---
.../patches/utcnow-deprecation.patch | 24 ++++++++++++-------
srcpkgs/python3-jupyter_server/template | 4 ++--
2 files changed, 18 insertions(+), 10 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 <tornaria@cmat.edu.uy>
+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..ac99db62645e9 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.7.3
+version=2.8.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=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649
+checksum=b11e2ba80667c75f55630faf8ac3d5809f8734f9006d65cce117c46a0a516ab8
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (connect to a tcp address)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
2023-10-20 1:36 ` [PR PATCH] [Updated] " tornaria
@ 2023-10-20 1:44 ` tornaria
2023-10-25 13:12 ` [PR PATCH] [Updated] " tornaria
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-20 1:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/46784#issuecomment-1771944095
Comment:
There was a failure in x86_64-musl testing python3-jupyter_server:
```
FAILED tests/services/kernels/test_api.py::test_connection[jp_server_config0] - assert 1 == 0
```
I think this is transient failure (a connection not closed in time; tests in jupyter are a little bit flaky). Force-pushed with no changes to retest.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
2023-10-20 1:36 ` [PR PATCH] [Updated] " tornaria
2023-10-20 1:44 ` tornaria
@ 2023-10-25 13:12 ` tornaria
2023-10-25 20:58 ` tornaria
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-25 13:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 20080 bytes --]
From c72271cb76e0d2a8ba7179621ecf2ca0cdf627cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 25 Oct 2023 09:21:19 -0300
Subject: [PATCH 1/8] python3-traitlets: update to 5.12.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..eb49fbf51ea23 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.12.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=833273bf645d8ce31dcb613c56999e2e055b1ffe6d09168a164bcd91c36d5d35
post_install() {
vlicense LICENSE
From c80352b872c717756021353ae69ec4ad951f7641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 11:29:47 -0300
Subject: [PATCH 2/8] python3-jupyter_core: update to 5.4.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..36603418d14a9 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.4.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=e4b98344bb94ee2e3e6c4519a97d001656009f9cb2b7f2baf15b3c205770011d
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 c4ab0fe8c3deb91f3c046b6dd4f5f232bf0e852f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:08:13 -0300
Subject: [PATCH 3/8] 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 02f882b3fe7b177219d5205a00ef3e07bbd40b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:21 -0300
Subject: [PATCH 4/8] python3-jupyter_client: update to 8.4.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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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..ac3035ca8a455 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.4.0 and jupyter_client 8.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 25d26b4105e61364e8d3a7f3472b38515054d6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 25 Oct 2023 09:21:27 -0300
Subject: [PATCH 5/8] 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 7ef49d794b48317c7d4cb23cbce52b13352fd425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:16:08 -0300
Subject: [PATCH 6/8] 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 ecaa65b5d20a17879e4d522be48e3a905c1eb32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:47 -0300
Subject: [PATCH 7/8] 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 3016d922b5f53590b4650e255ed0698a516b33e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:14:46 -0300
Subject: [PATCH 8/8] python3-jupyter_server: update to 2.8.0.
---
.../patches/utcnow-deprecation.patch | 24 ++++++++++++-------
srcpkgs/python3-jupyter_server/template | 4 ++--
2 files changed, 18 insertions(+), 10 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 <tornaria@cmat.edu.uy>
+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..eb0aa69ca26ff 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.7.3
+version=2.9.1
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=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649
+checksum=9ba71be4b9c16e479e4c50c929f8ac4b1015baf90237a08681397a98c76c7e5e
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (connect to a tcp address)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (2 preceding siblings ...)
2023-10-25 13:12 ` [PR PATCH] [Updated] " tornaria
@ 2023-10-25 20:58 ` tornaria
2023-10-30 15:33 ` tornaria
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-25 20:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 20080 bytes --]
From c72271cb76e0d2a8ba7179621ecf2ca0cdf627cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 25 Oct 2023 09:21:19 -0300
Subject: [PATCH 1/8] python3-traitlets: update to 5.12.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..eb49fbf51ea23 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.12.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=833273bf645d8ce31dcb613c56999e2e055b1ffe6d09168a164bcd91c36d5d35
post_install() {
vlicense LICENSE
From c80352b872c717756021353ae69ec4ad951f7641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 11:29:47 -0300
Subject: [PATCH 2/8] python3-jupyter_core: update to 5.4.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..36603418d14a9 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.4.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=e4b98344bb94ee2e3e6c4519a97d001656009f9cb2b7f2baf15b3c205770011d
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 c4ab0fe8c3deb91f3c046b6dd4f5f232bf0e852f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:08:13 -0300
Subject: [PATCH 3/8] 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 02f882b3fe7b177219d5205a00ef3e07bbd40b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:21 -0300
Subject: [PATCH 4/8] python3-jupyter_client: update to 8.4.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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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..ac3035ca8a455 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.4.0 and jupyter_client 8.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 25d26b4105e61364e8d3a7f3472b38515054d6f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 25 Oct 2023 09:21:27 -0300
Subject: [PATCH 5/8] 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 7ef49d794b48317c7d4cb23cbce52b13352fd425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:16:08 -0300
Subject: [PATCH 6/8] 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 ecaa65b5d20a17879e4d522be48e3a905c1eb32e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:47 -0300
Subject: [PATCH 7/8] 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 5aadecff1eb011b62408b953dccc056a00fdb6d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:14:46 -0300
Subject: [PATCH 8/8] python3-jupyter_server: update to 2.8.0.
---
.../patches/utcnow-deprecation.patch | 24 ++++++++++++-------
srcpkgs/python3-jupyter_server/template | 4 ++--
2 files changed, 18 insertions(+), 10 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 <tornaria@cmat.edu.uy>
+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..eb0aa69ca26ff 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.7.3
+version=2.9.1
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=d4916c8581c4ebbc534cebdaa8eca2478d9f3bfdd88eae29fcab0120eac57649
+checksum=9ba71be4b9c16e479e4c50c929f8ac4b1015baf90237a08681397a98c76c7e5e
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (connect to a tcp address)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (3 preceding siblings ...)
2023-10-25 20:58 ` tornaria
@ 2023-10-30 15:33 ` tornaria
2023-10-30 18:25 ` tornaria
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-30 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 24396 bytes --]
From 15b5fa8bc9f9abe8693fe287f9608771289127b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 4fcb6553b6b8a81ca9b257fd3c5cc3b560218766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 79a0afdae9bbf0db7bd89e7b6c8cd50dc7f779fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 e28ba5a7092711a87449114e812d594026bea9d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 c356ea0c26eb93675ce648bbe1852e8922ca6cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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 c377f4d3a718bb27593518ad81c92dfe73ce591d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Oct 2023 10:02:59 -0300
Subject: [PATCH 06/11] python3-ipython: update to 8.17.1.
---
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..281ad74d1d6a1 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.1
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=9e12020f4bf74f08631c0f033bb580e074fbe36c64903195f3e63b9c0a986cbe
conflicts="python-ipython<=5.8.0_2"
make_check_pre="env PYTHONPATH=."
From ed65a4911ce6c0e60c7b5adf1db7275586f9b9dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 0549c287d5009e638d0ee913b2bb249bc1ab550a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 efb3d1ed4ac19e6ddbfe6cc88265a74062181a53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 048c0b91ddfcc35a69d0706469f41a262abf2ec7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 4553e53340c224e965485c184a1e2d347252df56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 <tornaria@cmat.edu.uy>
+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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (4 preceding siblings ...)
2023-10-30 15:33 ` tornaria
@ 2023-10-30 18:25 ` tornaria
2023-10-31 21:12 ` [PR PATCH] [Updated] " tornaria
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-30 18:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 191 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/46784#issuecomment-1785807392
Comment:
@ahesford this includes ipython update to 8.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (5 preceding siblings ...)
2023-10-30 18:25 ` tornaria
@ 2023-10-31 21:12 ` tornaria
2023-11-01 13:17 ` tornaria
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-10-31 21:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 26772 bytes --]
From 3987ff11fab2b6239569a8195e2043b72634578f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 31 Oct 2023 18:05:08 -0300
Subject: [PATCH 01/12] python3-pytest-asyncio: update to 0.22.0.
---
.../python3-pytest-asyncio/patches/fix-test.patch | 15 ---------------
srcpkgs/python3-pytest-asyncio/template | 6 +++---
2 files changed, 3 insertions(+), 18 deletions(-)
delete mode 100644 srcpkgs/python3-pytest-asyncio/patches/fix-test.patch
diff --git a/srcpkgs/python3-pytest-asyncio/patches/fix-test.patch b/srcpkgs/python3-pytest-asyncio/patches/fix-test.patch
deleted file mode 100644
index 3eee8be42fadf..0000000000000
--- a/srcpkgs/python3-pytest-asyncio/patches/fix-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/tests/hypothesis/test_inherited_test.py 2023-07-12 07:11:21.000000000 -0300
-+++ b/tests/hypothesis/test_inherited_test.py 2023-09-15 19:12:21.328680631 -0300
-@@ -1,10 +1,11 @@
- import hypothesis.strategies as st
- import pytest
--from hypothesis import given
-+from hypothesis import given, settings, HealthCheck
-
-
- class BaseClass:
- @pytest.mark.asyncio
-+ @settings(suppress_health_check=(HealthCheck.differing_executors,))
- @given(value=st.integers())
- async def test_hypothesis(self, value: int) -> None:
- pass
diff --git a/srcpkgs/python3-pytest-asyncio/template b/srcpkgs/python3-pytest-asyncio/template
index c997751e7c88c..ee99529f8133a 100644
--- a/srcpkgs/python3-pytest-asyncio/template
+++ b/srcpkgs/python3-pytest-asyncio/template
@@ -1,7 +1,7 @@
# Template file for 'python3-pytest-asyncio'
pkgname=python3-pytest-asyncio
-version=0.21.1
-revision=2
+version=0.22.0
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3-pytest"
@@ -12,7 +12,7 @@ license="Apache-2.0"
homepage="https://github.com/pytest-dev/pytest-asyncio"
changelog="https://raw.githubusercontent.com/pytest-dev/pytest-asyncio/master/docs/source/reference/changelog.rst"
distfiles="${PYPI_SITE}/p/pytest-asyncio/pytest-asyncio-${version}.tar.gz"
-checksum=40a7eae6dded22c7b604986855ea48400ab15b069ae38116e8c01238e9eeb64d
+checksum=01da1bf94ff0b969cc8d760104f7c1011903d0d658bdaef0bbae769660a7fbc4
if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
# these tests fail on CI (bind to a tcp address)
From 4e3fec2513336fd81e0baf04ebed4781d88319a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Oct 2023 11:41:35 -0300
Subject: [PATCH 02/12] 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 2468cbc0c1ba838886a3f3baf7c18276b6adee49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 25 Oct 2023 09:21:19 -0300
Subject: [PATCH 03/12] 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 ecfe58ef9b6034d75f2f24d56d9acc9d83bdcce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 11:29:47 -0300
Subject: [PATCH 04/12] 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 ee11c11ce21b93e247c779ab230b58bc8ff1c926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:08:13 -0300
Subject: [PATCH 05/12] 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 355b258a049272ed455b9fe653397499d2dcbfd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:21 -0300
Subject: [PATCH 06/12] 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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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 223db185771c001f0014251f794f4df8f7974ce6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Oct 2023 10:02:59 -0300
Subject: [PATCH 07/12] 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 477dce27f82d372ffbae2dd3198693d689c63110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Wed, 25 Oct 2023 09:21:27 -0300
Subject: [PATCH 08/12] 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 6d072709f1128f1fb1fc01bd153f96fb1ce2b831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 30 Oct 2023 10:02:54 -0300
Subject: [PATCH 09/12] 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 2c56e386e732b9ad800a62e886a6a484d46e8bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:16:08 -0300
Subject: [PATCH 10/12] 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 e4fa7e6df09f2f6e282e43ecaf35fdb95cdba76d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:09:47 -0300
Subject: [PATCH 11/12] 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 03a18d592d7035e6c70cfaff5e1fca365d47b5bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Mon, 16 Oct 2023 10:14:46 -0300
Subject: [PATCH 12/12] 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 <tornaria@cmat.edu.uy>
+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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (6 preceding siblings ...)
2023-10-31 21:12 ` [PR PATCH] [Updated] " tornaria
@ 2023-11-01 13:17 ` tornaria
2023-11-01 13:23 ` [PR PATCH] [Updated] " tornaria
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-11-01 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/46784#issuecomment-1788939242
Comment:
It seems the update of `pytest-asyncio` breaks testing `ipython_ipykernel`:
```
...
INTERNALERROR> File "/builddir/python3-ipython_ipykernel-6.26.0/tests/test_debugger.py", line 10, in <module>
INTERNALERROR> pytest.importorskip("debugpy")
INTERNALERROR> File "/usr/lib/python3.12/site-packages/_pytest/outcomes.py", line 296, in importorskip
INTERNALERROR> raise Skipped(reason, allow_module_level=True) from None
INTERNALERROR> Skipped: could not import 'debugpy': No module named 'debugpy'
```
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (7 preceding siblings ...)
2023-11-01 13:17 ` tornaria
@ 2023-11-01 13:23 ` tornaria
2023-11-01 13:24 ` tornaria
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-11-01 13:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 24396 bytes --]
From 79694b949cbd482b563cfcd2515f39eaa8ef6af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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 <tornaria@cmat.edu.uy>
+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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (8 preceding siblings ...)
2023-11-01 13:23 ` [PR PATCH] [Updated] " tornaria
@ 2023-11-01 13:24 ` tornaria
2023-11-01 20:52 ` [PR PATCH] [Updated] " tornaria
2023-11-02 2:25 ` [PR PATCH] [Merged]: " ahesford
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-11-01 13:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/46784#issuecomment-1788951487
Comment:
Upstream bug: https://github.com/pytest-dev/pytest-asyncio/issues/655 and possible fix https://github.com/pytest-dev/pytest-asyncio/pull/656.
Let's just stay on pytest-asyncio 0.21.1 and wait for a new release.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Updated] A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (9 preceding siblings ...)
2023-11-01 13:24 ` tornaria
@ 2023-11-01 20:52 ` tornaria
2023-11-02 2:25 ` [PR PATCH] [Merged]: " ahesford
11 siblings, 0 replies; 13+ messages in thread
From: tornaria @ 2023-11-01 20:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1252 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages jupyter
https://github.com/void-linux/void-packages/pull/46784
A few jupyter (minor) updates
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/46784.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jupyter-46784.patch --]
[-- Type: text/x-diff, Size: 24396 bytes --]
From 79694b949cbd482b563cfcd2515f39eaa8ef6af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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 <mattias.ellert@physics.uu.se>
-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 <david.brochart@gmail.com>
-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 <david.brochart@gmail.com>
-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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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?= <tornaria@cmat.edu.uy>
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 df1c67aa536cddb2f1a313ece4bd70ac883b46d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
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 <tornaria@cmat.edu.uy>
+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
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PR PATCH] [Merged]: A few jupyter (minor) updates
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
` (10 preceding siblings ...)
2023-11-01 20:52 ` [PR PATCH] [Updated] " tornaria
@ 2023-11-02 2:25 ` ahesford
11 siblings, 0 replies; 13+ messages in thread
From: ahesford @ 2023-11-02 2:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1094 bytes --]
There's a merged pull request on the void-packages repository
A few jupyter (minor) updates
https://github.com/void-linux/void-packages/pull/46784
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-11-02 2:25 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-20 0:25 [PR PATCH] A few jupyter (minor) updates tornaria
2023-10-20 1:36 ` [PR PATCH] [Updated] " tornaria
2023-10-20 1:44 ` tornaria
2023-10-25 13:12 ` [PR PATCH] [Updated] " tornaria
2023-10-25 20:58 ` tornaria
2023-10-30 15:33 ` tornaria
2023-10-30 18:25 ` tornaria
2023-10-31 21:12 ` [PR PATCH] [Updated] " tornaria
2023-11-01 13:17 ` tornaria
2023-11-01 13:23 ` [PR PATCH] [Updated] " tornaria
2023-11-01 13:24 ` tornaria
2023-11-01 20:52 ` [PR PATCH] [Updated] " tornaria
2023-11-02 2:25 ` [PR PATCH] [Merged]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).