Re: [PR PATCH] [Updated] A few jupyter (minor) updates

[tornaria <tornaria@users.noreply.github.com>]

[-- 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)