From 8afa8410e26b1c33ebe45b4be8ef5a5728e3981a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Mon, 16 Oct 2023 10:14:46 -0300 Subject: [PATCH] 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 e5f7a2af5b3..7a69b8f834e 100644 --- a/srcpkgs/python3-jupyter_server/patches/utcnow-deprecation.patch +++ b/srcpkgs/python3-jupyter_server/patches/utcnow-deprecation.patch @@ -1,17 +1,25 @@ -See: https://github.com/jupyter-server/jupyter_server/issues/1296#issuecomment-1751887150 +commit 13def167faf8898b2e19fc04f24c0ff6f6cc35fa +Author: Gonzalo Tornaría +Date: Mon Oct 16 10:38:36 2023 -0300 + utcnow deprecation + + See: https://github.com/jupyter-server/jupyter_server/issues/1296#issuecomment-1751887150 + +diff --git a/jupyter_server/_tz.py b/jupyter_server/_tz.py +index 24847b430..ea3e65fe2 100644 --- a/jupyter_server/_tz.py +++ b/jupyter_server/_tz.py -@@ -5,7 +5,7 @@ Just UTC-awareness right now - """ - # Copyright (c) Jupyter Development Team. +@@ -7,7 +7,7 @@ Just UTC-awareness right now # Distributed under the terms of the Modified BSD License. + from __future__ import annotations + -from datetime import datetime, timedelta, tzinfo +from datetime import datetime, timedelta, tzinfo, timezone + from typing import Callable # constant for zero offset - ZERO = timedelta(0) -@@ -39,6 +39,12 @@ def utc_aware(unaware): +@@ -42,6 +42,12 @@ def utc_aware(unaware: Callable[..., datetime]) -> Callable[..., datetime]: utcfromtimestamp = utc_aware(datetime.utcfromtimestamp) utcnow = utc_aware(datetime.utcnow) @@ -22,10 +30,10 @@ See: https://github.com/jupyter-server/jupyter_server/issues/1296#issuecomment-1 +def utcfromtimestamp(timestamp): + return datetime.fromtimestamp(timestamp, timezone.utc) - def isoformat(dt): + def isoformat(dt: datetime) -> str: """Return iso-formatted timestamp diff --git a/tests/test_gateway.py b/tests/test_gateway.py -index 8f7f8a463..598006e29 100644 +index 37ce8b03e..e1ea0869e 100644 --- a/tests/test_gateway.py +++ b/tests/test_gateway.py @@ -78,7 +78,7 @@ omitted_kernels: Dict[str, bool] = {} diff --git a/srcpkgs/python3-jupyter_server/template b/srcpkgs/python3-jupyter_server/template index b0bd9f2f758..f38ab9ed7ee 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