* [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
@ 2023-12-22 18:09 tornaria
2023-12-22 19:22 ` tornaria
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: tornaria @ 2023-12-22 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]
There is a new pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages ipython
https://github.com/void-linux/void-packages/pull/47875
Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
I tested it with sagemath on x86_64 (full check, with -K; ftr, there is one unrelated and unimportant test failure in sage/calculus/calculus.py).
Full changelog:
- python3-pexpect: update to 4.9.0, adopt.
- python3-traitlets: update to 5.14.0.
- python3-ipython: update to 8.19.0.
- python3-nest_asyncio: update to 1.5.8.
- python3-psutil: update to 5.9.7, add check.
- python3-tornado: update to 6.4, adopt.
- python3-ipython_ipykernel: update to 6.27.1.
@ahesford
<!--
#### 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/47875.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ipython-47875.patch --]
[-- Type: text/x-diff, Size: 31366 bytes --]
From 4c61ea6857d0dce053b9dfee4408cc4e640595e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 22 Dec 2023 10:18:37 -0300
Subject: [PATCH 1/7] python3-pexpect: update to 4.9.0, adopt.
---
srcpkgs/python3-pexpect/template | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
index 9ff33710ccf53..cb77bc58a366a 100644
--- a/srcpkgs/python3-pexpect/template
+++ b/srcpkgs/python3-pexpect/template
@@ -1,27 +1,19 @@
# Template file for 'python3-pexpect'
pkgname=python3-pexpect
-version=4.8.0
-revision=4
+version=4.9.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ptyprocess"
-checkdepends="python3-pytest python3-ptyprocess mdocml"
-short_desc="Python3 module for spawning child applications and controlling them"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="$depends python3-pytest mdocml zsh"
+short_desc="Spawn child applications and control them"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="ISC"
homepage="https://pexpect.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/pexpect/pexpect/master/doc/history.rst"
distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
-checksum=fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
-
-do_check() {
- # the mdcocml is for test
- # REPLWrapTestCase.test_pager_as_cat
- python3 -m pytest
-}
+checksum=ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f
post_install() {
- # drop asyncio stuff from python2
- # https://github.com/pexpect/pexpect/issues/290
- rm -f ${DESTDIR}/usr/lib/python$py3_ver/site-packages/pexpect/_async.py
vlicense LICENSE
}
From 1d4280b3d211a794b315244d9152024d6529e719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:04 -0300
Subject: [PATCH 2/7] python3-traitlets: update to 5.14.0.
---
srcpkgs/python3-traitlets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 3f418299ccf2f..6069bde7055ca 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,6 +1,6 @@
# Template file for 'python3-traitlets'
pkgname=python3-traitlets
-version=5.13.0
+version=5.14.0
revision=1
build_style=python3-pep517
# needs python3-pytest-mypy
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ipython/traitlets"
changelog="https://raw.githubusercontent.com/ipython/traitlets/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=9b232b9430c8f57288c1024b34a8f0251ddcc47268927367a0dd3eeaca40deb5
+checksum=fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772
post_install() {
vlicense LICENSE
From c2cd11ec369706fd7560a31498da3e3fa06df810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:12 -0300
Subject: [PATCH 3/7] python3-ipython: update to 8.19.0.
---
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 c74bc4e28341c..038128536d5eb 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.18.0
+version=8.19.0
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=4feb61210160f75e229ce932dbf8b719bff37af123c0b985fd038b14233daa16
+checksum=ac4da4ecf0042fb4e0ce57c60430c2db3c719fa8bdf92f8631d6bd8a5785d1f0
conflicts="python-ipython<=5.8.0_2"
make_check_pre="env PYTHONPATH=."
From e63c5c35a72e250643c32c1000b441379fe3f894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 17 Dec 2023 08:38:32 -0300
Subject: [PATCH 4/7] python3-nest_asyncio: update to 1.5.8.
---
srcpkgs/python3-nest_asyncio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index c273dde98ed0d..a27114ab7e271 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,7 +1,7 @@
# Template file for 'python3-nest_asyncio'
pkgname=python3-nest_asyncio
-version=1.5.6
-revision=2
+version=1.5.8
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/erdewit/nest_asyncio"
distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
-checksum=d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290
+checksum=25aa2ca0d2a5b5531956b9e273b45cf664cae2b145101d73b86b199978d48fdb
post_install() {
vlicense LICENSE
From 8869c342673fad42a5dc787d66e2dd973f5bfc5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 22 Dec 2023 13:33:44 -0300
Subject: [PATCH 5/7] python3-psutil: update to 5.9.7, add check.
---
srcpkgs/python3-psutil/template | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index 936f1b99fb972..2aa1b0ae42e4c 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,20 +1,31 @@
# Template file for 'python3-psutil'
pkgname=python3-psutil
-version=5.9.6
+version=5.9.7
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+# Failing tests: see https://github.com/giampaolo/psutil/issues/2043
+make_check_args="--import-mode=importlib
+ --deselect psutil/tests/test_contracts.py::TestFetchAllProcesses::test_all
+ --deselect psutil/tests/test_linux.py::TestProcess::test_exe_mocked
+ --deselect psutil/tests/test_linux.py::TestRootFsDeviceFinder::test_against_findmnt
+ --deselect psutil/tests/test_linux.py::TestSystemVirtualMemoryAgainstFree::test_used
+ --deselect psutil/tests/test_linux.py::TestSystemVirtualMemoryAgainstVmstat::test_used
+ --deselect psutil/tests/test_misc.py::TestCommonModule::test_debug
+ --deselect psutil/tests/test_process.py::TestProcess::test_terminal
+ --deselect psutil/tests/test_system.py::TestDiskAPIs::test_disk_partitions
+ --deselect psutil/tests/test_system.py::TestMiscAPIs::test_users"
+hostmakedepends="python3-setuptools python3-wheel"
makedepends="python3-devel"
depends="python3"
+# two tests use `util-linux` (findmnt), but it conflicts `chroot-util-linux`
+checkdepends="python3-pytest procps-ng inetutils-ifconfig"
short_desc="Cross-platform process and system utilities module for Python3"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/giampaolo/psutil"
changelog="https://raw.githubusercontent.com/giampaolo/psutil/master/HISTORY.rst"
distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz"
-checksum=e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a
-# Tests seem to assume package is installed
-make_check=no
+checksum=3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c
post_install() {
rm -r ${DESTDIR}/${py3_sitelib}/psutil/tests/
From 31920554f322b1455690baabd02d4f4dbede09b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 5 Dec 2023 21:13:00 -0300
Subject: [PATCH 6/7] python3-tornado: update to 6.4, adopt.
---
.../patches/3288-utcnow-deprecation.patch | 378 ------------------
.../patches/3335-utcnow-deprecation.patch | 81 ----
srcpkgs/python3-tornado/template | 6 +-
3 files changed, 3 insertions(+), 462 deletions(-)
delete mode 100644 srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
delete mode 100644 srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
diff --git a/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch b/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
deleted file mode 100644
index 19e7ff9714e5d..0000000000000
--- a/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-Taken from https://github.com/tornadoweb/tornado/pull/3288
-
-From 4d4d80c1d076dcb4e051c969ae4b66557d3856b8 Mon Sep 17 00:00:00 2001
-From: Ben Darnell <ben@bendarnell.com>
-Date: Thu, 8 Jun 2023 22:52:19 -0400
-Subject: [PATCH] *: Adapt to deprecation of datetime utc methods
-
-Python 3.12 deprecates the utcnow and utcfromtimestamp methods and
-discourages the use of naive datetimes to represent UTC. This was
-previously the main way that Tornado used datetimes (since it was
-the only option available in Python 2 before the introduction
-of datetime.timezone.utc in Python 3.2).
-
-- httpclient_test: Test-only change to test that both kinds of datetimes
- are supported in If-Modified-Since (this just calls
- httputil.format_timestamp)
-- httputil: No functional changes, but format_timestamp's
- support for both naive and aware datetimes is now tested.
-- locale: format_timestamp now supports aware datetimes (in
- addition to the existing support for naive datetimes).
-- web: Cookie expirations internally use aware datetimes.
- StaticFileHandler.get_modified_time now supports both and the
- standard implementation returns aware.
-
-It feels fragile that "naive" and "aware" datetimes are not distinct
-types but subject to data-dependent behavior. This change uses
-"aware" datetimes throughout Tornado, but some operations (comparisons
-and subtraction) fail with mixed datetime types and if I missed any
-in this change may cause errors if naive datetimes were used (where
-previously naive datetimes would have been required). But that's
-apparently the API we have to work with.
----
- tornado/httputil.py | 3 +-
- tornado/locale.py | 12 +++--
- tornado/test/httpclient_test.py | 12 ++++-
- tornado/test/httputil_test.py | 26 +++++++++-
- tornado/test/locale_test.py | 88 ++++++++++++++++++---------------
- tornado/test/web_test.py | 25 +++++-----
- tornado/web.py | 28 +++++++----
- 7 files changed, 126 insertions(+), 68 deletions(-)
-
-diff --git a/tornado/httputil.py b/tornado/httputil.py
-index 9c341d47cc..b21d8046c4 100644
---- a/tornado/httputil.py
-+++ b/tornado/httputil.py
-@@ -856,7 +856,8 @@ def format_timestamp(
-
- The argument may be a numeric timestamp as returned by `time.time`,
- a time tuple as returned by `time.gmtime`, or a `datetime.datetime`
-- object.
-+ object. Naive `datetime.datetime` objects are assumed to represent
-+ UTC; aware objects are converted to UTC before formatting.
-
- >>> format_timestamp(1359312200)
- 'Sun, 27 Jan 2013 18:43:20 GMT'
-diff --git a/tornado/locale.py b/tornado/locale.py
-index 55072af28d..c5526703b1 100644
---- a/tornado/locale.py
-+++ b/tornado/locale.py
-@@ -333,7 +333,7 @@ def format_date(
- shorter: bool = False,
- full_format: bool = False,
- ) -> str:
-- """Formats the given date (which should be GMT).
-+ """Formats the given date.
-
- By default, we return a relative time (e.g., "2 minutes ago"). You
- can return an absolute date string with ``relative=False``.
-@@ -343,10 +343,16 @@ def format_date(
-
- This method is primarily intended for dates in the past.
- For dates in the future, we fall back to full format.
-+
-+ .. versionchanged:: 6.4
-+ Aware `datetime.datetime` objects are now supported (naive
-+ datetimes are still assumed to be UTC).
- """
- if isinstance(date, (int, float)):
-- date = datetime.datetime.utcfromtimestamp(date)
-- now = datetime.datetime.utcnow()
-+ date = datetime.datetime.fromtimestamp(date, datetime.timezone.utc)
-+ if date.tzinfo is None:
-+ date = date.replace(tzinfo=datetime.timezone.utc)
-+ now = datetime.datetime.now(datetime.timezone.utc)
- if date > now:
- if relative and (date - now).seconds < 60:
- # Due to click skew, things are some things slightly
-diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
-index a71ec0afb6..a41040e64a 100644
---- a/tornado/test/httpclient_test.py
-+++ b/tornado/test/httpclient_test.py
-@@ -28,7 +28,7 @@
- from tornado.log import gen_log, app_log
- from tornado import netutil
- from tornado.testing import AsyncHTTPTestCase, bind_unused_port, gen_test, ExpectLog
--from tornado.test.util import skipOnTravis
-+from tornado.test.util import skipOnTravis, ignore_deprecation
- from tornado.web import Application, RequestHandler, url
- from tornado.httputil import format_timestamp, HTTPHeaders
-
-@@ -887,7 +887,15 @@ def test_body_setter(self):
- self.assertEqual(request.body, utf8("foo"))
-
- def test_if_modified_since(self):
-- http_date = datetime.datetime.utcnow()
-+ http_date = datetime.datetime.now(datetime.timezone.utc)
-+ request = HTTPRequest("http://example.com", if_modified_since=http_date)
-+ self.assertEqual(
-+ request.headers, {"If-Modified-Since": format_timestamp(http_date)}
-+ )
-+
-+ def test_if_modified_since_naive_deprecated(self):
-+ with ignore_deprecation():
-+ http_date = datetime.datetime.utcnow()
- request = HTTPRequest("http://example.com", if_modified_since=http_date)
- self.assertEqual(
- request.headers, {"If-Modified-Since": format_timestamp(http_date)}
-diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
-index 8424491d87..aa9b6ee253 100644
---- a/tornado/test/httputil_test.py
-+++ b/tornado/test/httputil_test.py
-@@ -13,6 +13,7 @@
- from tornado.escape import utf8, native_str
- from tornado.log import gen_log
- from tornado.testing import ExpectLog
-+from tornado.test.util import ignore_deprecation
-
- import copy
- import datetime
-@@ -412,8 +413,29 @@ def test_time_tuple(self):
- self.assertEqual(9, len(tup))
- self.check(tup)
-
-- def test_datetime(self):
-- self.check(datetime.datetime.utcfromtimestamp(self.TIMESTAMP))
-+ def test_utc_naive_datetime(self):
-+ self.check(
-+ datetime.datetime.fromtimestamp(
-+ self.TIMESTAMP, datetime.timezone.utc
-+ ).replace(tzinfo=None)
-+ )
-+
-+ def test_utc_naive_datetime_deprecated(self):
-+ with ignore_deprecation():
-+ self.check(datetime.datetime.utcfromtimestamp(self.TIMESTAMP))
-+
-+ def test_utc_aware_datetime(self):
-+ self.check(
-+ datetime.datetime.fromtimestamp(self.TIMESTAMP, datetime.timezone.utc)
-+ )
-+
-+ def test_other_aware_datetime(self):
-+ # Other timezones are ignored; the timezone is always printed as GMT
-+ self.check(
-+ datetime.datetime.fromtimestamp(
-+ self.TIMESTAMP, datetime.timezone(datetime.timedelta(hours=-4))
-+ )
-+ )
-
-
- # HTTPServerRequest is mainly tested incidentally to the server itself,
-diff --git a/tornado/test/locale_test.py b/tornado/test/locale_test.py
-index ee74cb05e8..a2e0872b8f 100644
---- a/tornado/test/locale_test.py
-+++ b/tornado/test/locale_test.py
-@@ -91,45 +91,55 @@ def test_format_date(self):
- locale.format_date(date, full_format=True), "April 28, 2013 at 6:35 pm"
- )
-
-- now = datetime.datetime.utcnow()
--
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(seconds=2), full_format=False),
-- "2 seconds ago",
-- )
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(minutes=2), full_format=False),
-- "2 minutes ago",
-- )
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(hours=2), full_format=False),
-- "2 hours ago",
-- )
--
-- self.assertEqual(
-- locale.format_date(
-- now - datetime.timedelta(days=1), full_format=False, shorter=True
-- ),
-- "yesterday",
-- )
--
-- date = now - datetime.timedelta(days=2)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- locale._weekdays[date.weekday()],
-- )
--
-- date = now - datetime.timedelta(days=300)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- "%s %d" % (locale._months[date.month - 1], date.day),
-- )
--
-- date = now - datetime.timedelta(days=500)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- "%s %d, %d" % (locale._months[date.month - 1], date.day, date.year),
-- )
-+ aware_dt = datetime.datetime.now(datetime.timezone.utc)
-+ naive_dt = aware_dt.replace(tzinfo=None)
-+ for name, now in {"aware": aware_dt, "naive": naive_dt}.items():
-+ with self.subTest(dt=name):
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(seconds=2), full_format=False
-+ ),
-+ "2 seconds ago",
-+ )
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(minutes=2), full_format=False
-+ ),
-+ "2 minutes ago",
-+ )
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(hours=2), full_format=False
-+ ),
-+ "2 hours ago",
-+ )
-+
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(days=1),
-+ full_format=False,
-+ shorter=True,
-+ ),
-+ "yesterday",
-+ )
-+
-+ date = now - datetime.timedelta(days=2)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ locale._weekdays[date.weekday()],
-+ )
-+
-+ date = now - datetime.timedelta(days=300)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ "%s %d" % (locale._months[date.month - 1], date.day),
-+ )
-+
-+ date = now - datetime.timedelta(days=500)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ "%s %d, %d" % (locale._months[date.month - 1], date.day, date.year),
-+ )
-
- def test_friendly_number(self):
- locale = tornado.locale.get("en_US")
-diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
-index 56900d9a00..fb9c3417b9 100644
---- a/tornado/test/web_test.py
-+++ b/tornado/test/web_test.py
-@@ -404,10 +404,10 @@ def test_set_cookie_expires_days(self):
- match = re.match("foo=bar; expires=(?P<expires>.+); Path=/", header)
- assert match is not None
-
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=10)
-- parsed = email.utils.parsedate(match.groupdict()["expires"])
-- assert parsed is not None
-- header_expires = datetime.datetime(*parsed[:6])
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=10
-+ )
-+ header_expires = email.utils.parsedate_to_datetime(match.groupdict()["expires"])
- self.assertTrue(abs((expires - header_expires).total_seconds()) < 10)
-
- def test_set_cookie_false_flags(self):
-@@ -1697,11 +1697,10 @@ def get(self):
-
- def test_date_header(self):
- response = self.fetch("/")
-- parsed = email.utils.parsedate(response.headers["Date"])
-- assert parsed is not None
-- header_date = datetime.datetime(*parsed[:6])
-+ header_date = email.utils.parsedate_to_datetime(response.headers["Date"])
- self.assertTrue(
-- header_date - datetime.datetime.utcnow() < datetime.timedelta(seconds=2)
-+ header_date - datetime.datetime.now(datetime.timezone.utc)
-+ < datetime.timedelta(seconds=2)
- )
-
-
-@@ -3010,10 +3009,12 @@ def test_xsrf_httponly(self):
- match = re.match(".*; expires=(?P<expires>.+);.*", header)
- assert match is not None
-
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=2)
-- parsed = email.utils.parsedate(match.groupdict()["expires"])
-- assert parsed is not None
-- header_expires = datetime.datetime(*parsed[:6])
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=2
-+ )
-+ header_expires = email.utils.parsedate_to_datetime(match.groupdict()["expires"])
-+ if header_expires.tzinfo is None:
-+ header_expires = header_expires.replace(tzinfo=datetime.timezone.utc)
- self.assertTrue(abs((expires - header_expires).total_seconds()) < 10)
-
-
-diff --git a/tornado/web.py b/tornado/web.py
-index 565140493e..439e02c47b 100644
---- a/tornado/web.py
-+++ b/tornado/web.py
-@@ -647,7 +647,9 @@ def set_cookie(
- if domain:
- morsel["domain"] = domain
- if expires_days is not None and not expires:
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=expires_days)
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=expires_days
-+ )
- if expires:
- morsel["expires"] = httputil.format_timestamp(expires)
- if path:
-@@ -698,7 +700,9 @@ def clear_cookie(self, name: str, **kwargs: Any) -> None:
- raise TypeError(
- f"clear_cookie() got an unexpected keyword argument '{excluded_arg}'"
- )
-- expires = datetime.datetime.utcnow() - datetime.timedelta(days=365)
-+ expires = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(
-+ days=365
-+ )
- self.set_cookie(name, value="", expires=expires, **kwargs)
-
- def clear_all_cookies(self, **kwargs: Any) -> None:
-@@ -2812,12 +2816,12 @@ def should_return_304(self) -> bool:
- # content has not been modified
- ims_value = self.request.headers.get("If-Modified-Since")
- if ims_value is not None:
-- date_tuple = email.utils.parsedate(ims_value)
-- if date_tuple is not None:
-- if_since = datetime.datetime(*date_tuple[:6])
-- assert self.modified is not None
-- if if_since >= self.modified:
-- return True
-+ if_since = email.utils.parsedate_to_datetime(ims_value)
-+ if if_since.tzinfo is None:
-+ if_since = if_since.replace(tzinfo=datetime.timezone.utc)
-+ assert self.modified is not None
-+ if if_since >= self.modified:
-+ return True
-
- return False
-
-@@ -2981,6 +2985,10 @@ def get_modified_time(self) -> Optional[datetime.datetime]:
- object or None.
-
- .. versionadded:: 3.1
-+
-+ .. versionchanged:: 6.4
-+ Now returns an aware datetime object instead of a naive one.
-+ Subclasses that override this method may return either kind.
- """
- stat_result = self._stat()
- # NOTE: Historically, this used stat_result[stat.ST_MTIME],
-@@ -2991,7 +2999,9 @@ def get_modified_time(self) -> Optional[datetime.datetime]:
- # consistency with the past (and because we have a unit test
- # that relies on this), we truncate the float here, although
- # I'm not sure that's the right thing to do.
-- modified = datetime.datetime.utcfromtimestamp(int(stat_result.st_mtime))
-+ modified = datetime.datetime.fromtimestamp(
-+ int(stat_result.st_mtime), datetime.timezone.utc
-+ )
- return modified
-
- def get_content_type(self) -> str:
diff --git a/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch b/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
deleted file mode 100644
index 23c210d12f689..0000000000000
--- a/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Taken from https://github.com/tornadoweb/tornado/pull/3335
-
-From 0bfca3f2d72a0c6e5d3ba17caac88a79e7b4e0dd Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 3 Oct 2023 15:08:08 +0100
-Subject: [PATCH] remove calls to utcnow and utcfromtimestamp
-
----
- demos/blog/templates/feed.xml | 2 +-
- demos/s3server/s3server.py | 16 +++++++++++-----
- tornado/web.py | 3 ++-
- 3 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/demos/blog/templates/feed.xml b/demos/blog/templates/feed.xml
-index a98826c8d3..4a4a252f60 100644
---- a/demos/blog/templates/feed.xml
-+++ b/demos/blog/templates/feed.xml
-@@ -5,7 +5,7 @@
- {% if len(entries) > 0 %}
- <updated>{{ max(e.updated for e in entries).strftime(date_format) }}</updated>
- {% else %}
-- <updated>{{ datetime.datetime.utcnow().strftime(date_format) }}</updated>
-+ <updated>{{ datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).strftime(date_format) }}</updated>
- {% end %}
- <id>http://{{ request.host }}/</id>
- <link rel="alternate" href="http://{{ request.host }}/" title="{{ handler.settings["blog_title"] }}" type="text/html"/>
-diff --git a/demos/s3server/s3server.py b/demos/s3server/s3server.py
-index 5c5e6af2ba..104a7c8f81 100644
---- a/demos/s3server/s3server.py
-+++ b/demos/s3server/s3server.py
-@@ -138,7 +138,9 @@ def get(self):
- buckets.append(
- {
- "Name": name,
-- "CreationDate": datetime.datetime.utcfromtimestamp(info.st_ctime),
-+ "CreationDate": datetime.datetime.fromtimestamp(
-+ info.st_ctime, datetime.timezone.utc
-+ ).replace(tzinfo=None),
- }
- )
- self.render_xml({"ListAllMyBucketsResult": {"Buckets": {"Bucket": buckets}}})
-@@ -183,9 +185,10 @@ def get(self, bucket_name):
- info = os.stat(object_path)
- c.update(
- {
-- "LastModified": datetime.datetime.utcfromtimestamp(
-- info.st_mtime
-- ),
-+ "LastModified": datetime.datetime.fromtimestamp(
-+ info.st_mtime,
-+ datetime.timezone.utc,
-+ ).replace(tzinfo=None),
- "Size": info.st_size,
- }
- )
-@@ -231,7 +234,10 @@ def get(self, bucket, object_name):
- info = os.stat(path)
- self.set_header("Content-Type", "application/unknown")
- self.set_header(
-- "Last-Modified", datetime.datetime.utcfromtimestamp(info.st_mtime)
-+ "Last-Modified",
-+ datetime.datetime.fromtimestamp(
-+ info.st_mtime, datetime.timezone.utc
-+ ).replace(tzinfo=None),
- )
- with open(path, "rb") as object_file:
- self.finish(object_file.read())
-diff --git a/tornado/web.py b/tornado/web.py
-index 333f736808..4416e2013e 100644
---- a/tornado/web.py
-+++ b/tornado/web.py
-@@ -2797,7 +2797,8 @@ def set_headers(self) -> None:
- if cache_time > 0:
- self.set_header(
- "Expires",
-- datetime.datetime.utcnow() + datetime.timedelta(seconds=cache_time),
-+ datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
-+ + datetime.timedelta(seconds=cache_time),
- )
- self.set_header("Cache-Control", "max-age=" + str(cache_time))
-
diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index 65bc0e55ac83e..dcb3ce06d7dbc 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,6 +1,6 @@
# Template file for 'python3-tornado'
pkgname=python3-tornado
-version=6.3.3
+version=6.4
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@@ -8,12 +8,12 @@ makedepends="python3-devel"
depends="python3 ca-certificates"
checkdepends="python3-curl python3-pycares python3-Twisted"
short_desc="Python3 web framework and asynchronous networking library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="Apache-2.0"
homepage="http://www.tornadoweb.org/"
changelog="https://www.tornadoweb.org/en/stable/releases.html"
distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe
+checksum=72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee
do_check() {
# There is one instance of test_bind_source_ip (the one for
From 47812cd01835f19581e1b3d6c725d410e6a35b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:13 -0300
Subject: [PATCH 7/7] python3-ipython_ipykernel: update to 6.27.1.
---
srcpkgs/python3-ipython_ipykernel/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 340082b9518fe..9f5076b5a63cc 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ipython_ipykernel'
pkgname=python3-ipython_ipykernel
-version=6.27.0
+version=6.27.1
revision=1
build_style=python3-pep517
# these tests fail in 6.26.0
@@ -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=7f4986f606581be73bfb32dc7a1ac9fa0e804c9be50ddf1c7a119413e982693f
+checksum=7d5d594b6690654b4d299edba5e872dc17bb7396a8d0609c97cb7b8a1c605de6
if [ "$XBPS_CHECK_PKGS" = full ]; then
# this would cause a build-time circular dependency
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
@ 2023-12-22 19:22 ` tornaria
2023-12-22 20:15 ` [PR PATCH] [Updated] " tornaria
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2023-12-22 19:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 424 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/47875#issuecomment-1868008160
Comment:
x86_64-musl failed due to a transient failure. However, I checked it locally and there is a test failure in psutils (because RLIMIT_RTTIME is not available in musl 1.1, add to reasons to update musl). I will push again with this test disabled on musl once the CI on glibc finishes.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
2023-12-22 19:22 ` tornaria
@ 2023-12-22 20:15 ` tornaria
2023-12-22 22:38 ` tornaria
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2023-12-22 20:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages ipython
https://github.com/void-linux/void-packages/pull/47875
Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
I tested it with sagemath on x86_64 (full check, with -K; ftr, there is one unrelated and unimportant test failure in sage/calculus/calculus.py).
Full changelog:
- python3-pexpect: update to 4.9.0, adopt.
- python3-traitlets: update to 5.14.0.
- python3-ipython: update to 8.19.0.
- python3-nest_asyncio: update to 1.5.8.
- python3-psutil: update to 5.9.7, add check.
- python3-tornado: update to 6.4, adopt.
- python3-ipython_ipykernel: update to 6.27.1.
@ahesford
<!--
#### 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/47875.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ipython-47875.patch --]
[-- Type: text/x-diff, Size: 31860 bytes --]
From 4c61ea6857d0dce053b9dfee4408cc4e640595e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 22 Dec 2023 10:18:37 -0300
Subject: [PATCH 1/7] python3-pexpect: update to 4.9.0, adopt.
---
srcpkgs/python3-pexpect/template | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
index 9ff33710ccf53..cb77bc58a366a 100644
--- a/srcpkgs/python3-pexpect/template
+++ b/srcpkgs/python3-pexpect/template
@@ -1,27 +1,19 @@
# Template file for 'python3-pexpect'
pkgname=python3-pexpect
-version=4.8.0
-revision=4
+version=4.9.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ptyprocess"
-checkdepends="python3-pytest python3-ptyprocess mdocml"
-short_desc="Python3 module for spawning child applications and controlling them"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="$depends python3-pytest mdocml zsh"
+short_desc="Spawn child applications and control them"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="ISC"
homepage="https://pexpect.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/pexpect/pexpect/master/doc/history.rst"
distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
-checksum=fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
-
-do_check() {
- # the mdcocml is for test
- # REPLWrapTestCase.test_pager_as_cat
- python3 -m pytest
-}
+checksum=ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f
post_install() {
- # drop asyncio stuff from python2
- # https://github.com/pexpect/pexpect/issues/290
- rm -f ${DESTDIR}/usr/lib/python$py3_ver/site-packages/pexpect/_async.py
vlicense LICENSE
}
From 1d4280b3d211a794b315244d9152024d6529e719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:04 -0300
Subject: [PATCH 2/7] python3-traitlets: update to 5.14.0.
---
srcpkgs/python3-traitlets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 3f418299ccf2f..6069bde7055ca 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,6 +1,6 @@
# Template file for 'python3-traitlets'
pkgname=python3-traitlets
-version=5.13.0
+version=5.14.0
revision=1
build_style=python3-pep517
# needs python3-pytest-mypy
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ipython/traitlets"
changelog="https://raw.githubusercontent.com/ipython/traitlets/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=9b232b9430c8f57288c1024b34a8f0251ddcc47268927367a0dd3eeaca40deb5
+checksum=fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772
post_install() {
vlicense LICENSE
From c2cd11ec369706fd7560a31498da3e3fa06df810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:12 -0300
Subject: [PATCH 3/7] python3-ipython: update to 8.19.0.
---
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 c74bc4e28341c..038128536d5eb 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.18.0
+version=8.19.0
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=4feb61210160f75e229ce932dbf8b719bff37af123c0b985fd038b14233daa16
+checksum=ac4da4ecf0042fb4e0ce57c60430c2db3c719fa8bdf92f8631d6bd8a5785d1f0
conflicts="python-ipython<=5.8.0_2"
make_check_pre="env PYTHONPATH=."
From e63c5c35a72e250643c32c1000b441379fe3f894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 17 Dec 2023 08:38:32 -0300
Subject: [PATCH 4/7] python3-nest_asyncio: update to 1.5.8.
---
srcpkgs/python3-nest_asyncio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index c273dde98ed0d..a27114ab7e271 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,7 +1,7 @@
# Template file for 'python3-nest_asyncio'
pkgname=python3-nest_asyncio
-version=1.5.6
-revision=2
+version=1.5.8
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/erdewit/nest_asyncio"
distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
-checksum=d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290
+checksum=25aa2ca0d2a5b5531956b9e273b45cf664cae2b145101d73b86b199978d48fdb
post_install() {
vlicense LICENSE
From 0fd095c6d3d533ed00aeb4857f45157daffd1e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 22 Dec 2023 13:33:44 -0300
Subject: [PATCH 5/7] python3-psutil: update to 5.9.7, add check.
---
srcpkgs/python3-psutil/template | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index 936f1b99fb972..859dae9cdd5e4 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,20 +1,37 @@
# Template file for 'python3-psutil'
pkgname=python3-psutil
-version=5.9.6
+version=5.9.7
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+# Failing tests: see https://github.com/giampaolo/psutil/issues/2043
+make_check_args="--import-mode=importlib
+ --deselect psutil/tests/test_contracts.py::TestFetchAllProcesses::test_all
+ --deselect psutil/tests/test_linux.py::TestProcess::test_exe_mocked
+ --deselect psutil/tests/test_linux.py::TestRootFsDeviceFinder::test_against_findmnt
+ --deselect psutil/tests/test_linux.py::TestSystemVirtualMemoryAgainstFree::test_used
+ --deselect psutil/tests/test_linux.py::TestSystemVirtualMemoryAgainstVmstat::test_used
+ --deselect psutil/tests/test_misc.py::TestCommonModule::test_debug
+ --deselect psutil/tests/test_process.py::TestProcess::test_terminal
+ --deselect psutil/tests/test_system.py::TestDiskAPIs::test_disk_partitions
+ --deselect psutil/tests/test_system.py::TestMiscAPIs::test_users"
+hostmakedepends="python3-setuptools python3-wheel"
makedepends="python3-devel"
depends="python3"
+# two tests use `util-linux` (findmnt), but it conflicts `chroot-util-linux`
+checkdepends="python3-pytest procps-ng inetutils-ifconfig"
short_desc="Cross-platform process and system utilities module for Python3"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/giampaolo/psutil"
changelog="https://raw.githubusercontent.com/giampaolo/psutil/master/HISTORY.rst"
distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz"
-checksum=e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a
-# Tests seem to assume package is installed
-make_check=no
+checksum=3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ # This test fails because RLIMIT_RTTIME is n/a in musl 1.1
+ make_check_args+=" --deselect
+ psutil/tests/test_contracts.py::TestAvailConstantsAPIs::test_rlimit"
+fi
post_install() {
rm -r ${DESTDIR}/${py3_sitelib}/psutil/tests/
From 161235271d627e9ec1bc565ceca6970ad39416f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 5 Dec 2023 21:13:00 -0300
Subject: [PATCH 6/7] python3-tornado: update to 6.4, adopt.
---
.../patches/3288-utcnow-deprecation.patch | 378 ------------------
.../patches/3335-utcnow-deprecation.patch | 81 ----
srcpkgs/python3-tornado/template | 6 +-
3 files changed, 3 insertions(+), 462 deletions(-)
delete mode 100644 srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
delete mode 100644 srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
diff --git a/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch b/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
deleted file mode 100644
index 19e7ff9714e5d..0000000000000
--- a/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-Taken from https://github.com/tornadoweb/tornado/pull/3288
-
-From 4d4d80c1d076dcb4e051c969ae4b66557d3856b8 Mon Sep 17 00:00:00 2001
-From: Ben Darnell <ben@bendarnell.com>
-Date: Thu, 8 Jun 2023 22:52:19 -0400
-Subject: [PATCH] *: Adapt to deprecation of datetime utc methods
-
-Python 3.12 deprecates the utcnow and utcfromtimestamp methods and
-discourages the use of naive datetimes to represent UTC. This was
-previously the main way that Tornado used datetimes (since it was
-the only option available in Python 2 before the introduction
-of datetime.timezone.utc in Python 3.2).
-
-- httpclient_test: Test-only change to test that both kinds of datetimes
- are supported in If-Modified-Since (this just calls
- httputil.format_timestamp)
-- httputil: No functional changes, but format_timestamp's
- support for both naive and aware datetimes is now tested.
-- locale: format_timestamp now supports aware datetimes (in
- addition to the existing support for naive datetimes).
-- web: Cookie expirations internally use aware datetimes.
- StaticFileHandler.get_modified_time now supports both and the
- standard implementation returns aware.
-
-It feels fragile that "naive" and "aware" datetimes are not distinct
-types but subject to data-dependent behavior. This change uses
-"aware" datetimes throughout Tornado, but some operations (comparisons
-and subtraction) fail with mixed datetime types and if I missed any
-in this change may cause errors if naive datetimes were used (where
-previously naive datetimes would have been required). But that's
-apparently the API we have to work with.
----
- tornado/httputil.py | 3 +-
- tornado/locale.py | 12 +++--
- tornado/test/httpclient_test.py | 12 ++++-
- tornado/test/httputil_test.py | 26 +++++++++-
- tornado/test/locale_test.py | 88 ++++++++++++++++++---------------
- tornado/test/web_test.py | 25 +++++-----
- tornado/web.py | 28 +++++++----
- 7 files changed, 126 insertions(+), 68 deletions(-)
-
-diff --git a/tornado/httputil.py b/tornado/httputil.py
-index 9c341d47cc..b21d8046c4 100644
---- a/tornado/httputil.py
-+++ b/tornado/httputil.py
-@@ -856,7 +856,8 @@ def format_timestamp(
-
- The argument may be a numeric timestamp as returned by `time.time`,
- a time tuple as returned by `time.gmtime`, or a `datetime.datetime`
-- object.
-+ object. Naive `datetime.datetime` objects are assumed to represent
-+ UTC; aware objects are converted to UTC before formatting.
-
- >>> format_timestamp(1359312200)
- 'Sun, 27 Jan 2013 18:43:20 GMT'
-diff --git a/tornado/locale.py b/tornado/locale.py
-index 55072af28d..c5526703b1 100644
---- a/tornado/locale.py
-+++ b/tornado/locale.py
-@@ -333,7 +333,7 @@ def format_date(
- shorter: bool = False,
- full_format: bool = False,
- ) -> str:
-- """Formats the given date (which should be GMT).
-+ """Formats the given date.
-
- By default, we return a relative time (e.g., "2 minutes ago"). You
- can return an absolute date string with ``relative=False``.
-@@ -343,10 +343,16 @@ def format_date(
-
- This method is primarily intended for dates in the past.
- For dates in the future, we fall back to full format.
-+
-+ .. versionchanged:: 6.4
-+ Aware `datetime.datetime` objects are now supported (naive
-+ datetimes are still assumed to be UTC).
- """
- if isinstance(date, (int, float)):
-- date = datetime.datetime.utcfromtimestamp(date)
-- now = datetime.datetime.utcnow()
-+ date = datetime.datetime.fromtimestamp(date, datetime.timezone.utc)
-+ if date.tzinfo is None:
-+ date = date.replace(tzinfo=datetime.timezone.utc)
-+ now = datetime.datetime.now(datetime.timezone.utc)
- if date > now:
- if relative and (date - now).seconds < 60:
- # Due to click skew, things are some things slightly
-diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
-index a71ec0afb6..a41040e64a 100644
---- a/tornado/test/httpclient_test.py
-+++ b/tornado/test/httpclient_test.py
-@@ -28,7 +28,7 @@
- from tornado.log import gen_log, app_log
- from tornado import netutil
- from tornado.testing import AsyncHTTPTestCase, bind_unused_port, gen_test, ExpectLog
--from tornado.test.util import skipOnTravis
-+from tornado.test.util import skipOnTravis, ignore_deprecation
- from tornado.web import Application, RequestHandler, url
- from tornado.httputil import format_timestamp, HTTPHeaders
-
-@@ -887,7 +887,15 @@ def test_body_setter(self):
- self.assertEqual(request.body, utf8("foo"))
-
- def test_if_modified_since(self):
-- http_date = datetime.datetime.utcnow()
-+ http_date = datetime.datetime.now(datetime.timezone.utc)
-+ request = HTTPRequest("http://example.com", if_modified_since=http_date)
-+ self.assertEqual(
-+ request.headers, {"If-Modified-Since": format_timestamp(http_date)}
-+ )
-+
-+ def test_if_modified_since_naive_deprecated(self):
-+ with ignore_deprecation():
-+ http_date = datetime.datetime.utcnow()
- request = HTTPRequest("http://example.com", if_modified_since=http_date)
- self.assertEqual(
- request.headers, {"If-Modified-Since": format_timestamp(http_date)}
-diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
-index 8424491d87..aa9b6ee253 100644
---- a/tornado/test/httputil_test.py
-+++ b/tornado/test/httputil_test.py
-@@ -13,6 +13,7 @@
- from tornado.escape import utf8, native_str
- from tornado.log import gen_log
- from tornado.testing import ExpectLog
-+from tornado.test.util import ignore_deprecation
-
- import copy
- import datetime
-@@ -412,8 +413,29 @@ def test_time_tuple(self):
- self.assertEqual(9, len(tup))
- self.check(tup)
-
-- def test_datetime(self):
-- self.check(datetime.datetime.utcfromtimestamp(self.TIMESTAMP))
-+ def test_utc_naive_datetime(self):
-+ self.check(
-+ datetime.datetime.fromtimestamp(
-+ self.TIMESTAMP, datetime.timezone.utc
-+ ).replace(tzinfo=None)
-+ )
-+
-+ def test_utc_naive_datetime_deprecated(self):
-+ with ignore_deprecation():
-+ self.check(datetime.datetime.utcfromtimestamp(self.TIMESTAMP))
-+
-+ def test_utc_aware_datetime(self):
-+ self.check(
-+ datetime.datetime.fromtimestamp(self.TIMESTAMP, datetime.timezone.utc)
-+ )
-+
-+ def test_other_aware_datetime(self):
-+ # Other timezones are ignored; the timezone is always printed as GMT
-+ self.check(
-+ datetime.datetime.fromtimestamp(
-+ self.TIMESTAMP, datetime.timezone(datetime.timedelta(hours=-4))
-+ )
-+ )
-
-
- # HTTPServerRequest is mainly tested incidentally to the server itself,
-diff --git a/tornado/test/locale_test.py b/tornado/test/locale_test.py
-index ee74cb05e8..a2e0872b8f 100644
---- a/tornado/test/locale_test.py
-+++ b/tornado/test/locale_test.py
-@@ -91,45 +91,55 @@ def test_format_date(self):
- locale.format_date(date, full_format=True), "April 28, 2013 at 6:35 pm"
- )
-
-- now = datetime.datetime.utcnow()
--
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(seconds=2), full_format=False),
-- "2 seconds ago",
-- )
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(minutes=2), full_format=False),
-- "2 minutes ago",
-- )
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(hours=2), full_format=False),
-- "2 hours ago",
-- )
--
-- self.assertEqual(
-- locale.format_date(
-- now - datetime.timedelta(days=1), full_format=False, shorter=True
-- ),
-- "yesterday",
-- )
--
-- date = now - datetime.timedelta(days=2)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- locale._weekdays[date.weekday()],
-- )
--
-- date = now - datetime.timedelta(days=300)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- "%s %d" % (locale._months[date.month - 1], date.day),
-- )
--
-- date = now - datetime.timedelta(days=500)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- "%s %d, %d" % (locale._months[date.month - 1], date.day, date.year),
-- )
-+ aware_dt = datetime.datetime.now(datetime.timezone.utc)
-+ naive_dt = aware_dt.replace(tzinfo=None)
-+ for name, now in {"aware": aware_dt, "naive": naive_dt}.items():
-+ with self.subTest(dt=name):
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(seconds=2), full_format=False
-+ ),
-+ "2 seconds ago",
-+ )
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(minutes=2), full_format=False
-+ ),
-+ "2 minutes ago",
-+ )
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(hours=2), full_format=False
-+ ),
-+ "2 hours ago",
-+ )
-+
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(days=1),
-+ full_format=False,
-+ shorter=True,
-+ ),
-+ "yesterday",
-+ )
-+
-+ date = now - datetime.timedelta(days=2)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ locale._weekdays[date.weekday()],
-+ )
-+
-+ date = now - datetime.timedelta(days=300)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ "%s %d" % (locale._months[date.month - 1], date.day),
-+ )
-+
-+ date = now - datetime.timedelta(days=500)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ "%s %d, %d" % (locale._months[date.month - 1], date.day, date.year),
-+ )
-
- def test_friendly_number(self):
- locale = tornado.locale.get("en_US")
-diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
-index 56900d9a00..fb9c3417b9 100644
---- a/tornado/test/web_test.py
-+++ b/tornado/test/web_test.py
-@@ -404,10 +404,10 @@ def test_set_cookie_expires_days(self):
- match = re.match("foo=bar; expires=(?P<expires>.+); Path=/", header)
- assert match is not None
-
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=10)
-- parsed = email.utils.parsedate(match.groupdict()["expires"])
-- assert parsed is not None
-- header_expires = datetime.datetime(*parsed[:6])
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=10
-+ )
-+ header_expires = email.utils.parsedate_to_datetime(match.groupdict()["expires"])
- self.assertTrue(abs((expires - header_expires).total_seconds()) < 10)
-
- def test_set_cookie_false_flags(self):
-@@ -1697,11 +1697,10 @@ def get(self):
-
- def test_date_header(self):
- response = self.fetch("/")
-- parsed = email.utils.parsedate(response.headers["Date"])
-- assert parsed is not None
-- header_date = datetime.datetime(*parsed[:6])
-+ header_date = email.utils.parsedate_to_datetime(response.headers["Date"])
- self.assertTrue(
-- header_date - datetime.datetime.utcnow() < datetime.timedelta(seconds=2)
-+ header_date - datetime.datetime.now(datetime.timezone.utc)
-+ < datetime.timedelta(seconds=2)
- )
-
-
-@@ -3010,10 +3009,12 @@ def test_xsrf_httponly(self):
- match = re.match(".*; expires=(?P<expires>.+);.*", header)
- assert match is not None
-
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=2)
-- parsed = email.utils.parsedate(match.groupdict()["expires"])
-- assert parsed is not None
-- header_expires = datetime.datetime(*parsed[:6])
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=2
-+ )
-+ header_expires = email.utils.parsedate_to_datetime(match.groupdict()["expires"])
-+ if header_expires.tzinfo is None:
-+ header_expires = header_expires.replace(tzinfo=datetime.timezone.utc)
- self.assertTrue(abs((expires - header_expires).total_seconds()) < 10)
-
-
-diff --git a/tornado/web.py b/tornado/web.py
-index 565140493e..439e02c47b 100644
---- a/tornado/web.py
-+++ b/tornado/web.py
-@@ -647,7 +647,9 @@ def set_cookie(
- if domain:
- morsel["domain"] = domain
- if expires_days is not None and not expires:
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=expires_days)
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=expires_days
-+ )
- if expires:
- morsel["expires"] = httputil.format_timestamp(expires)
- if path:
-@@ -698,7 +700,9 @@ def clear_cookie(self, name: str, **kwargs: Any) -> None:
- raise TypeError(
- f"clear_cookie() got an unexpected keyword argument '{excluded_arg}'"
- )
-- expires = datetime.datetime.utcnow() - datetime.timedelta(days=365)
-+ expires = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(
-+ days=365
-+ )
- self.set_cookie(name, value="", expires=expires, **kwargs)
-
- def clear_all_cookies(self, **kwargs: Any) -> None:
-@@ -2812,12 +2816,12 @@ def should_return_304(self) -> bool:
- # content has not been modified
- ims_value = self.request.headers.get("If-Modified-Since")
- if ims_value is not None:
-- date_tuple = email.utils.parsedate(ims_value)
-- if date_tuple is not None:
-- if_since = datetime.datetime(*date_tuple[:6])
-- assert self.modified is not None
-- if if_since >= self.modified:
-- return True
-+ if_since = email.utils.parsedate_to_datetime(ims_value)
-+ if if_since.tzinfo is None:
-+ if_since = if_since.replace(tzinfo=datetime.timezone.utc)
-+ assert self.modified is not None
-+ if if_since >= self.modified:
-+ return True
-
- return False
-
-@@ -2981,6 +2985,10 @@ def get_modified_time(self) -> Optional[datetime.datetime]:
- object or None.
-
- .. versionadded:: 3.1
-+
-+ .. versionchanged:: 6.4
-+ Now returns an aware datetime object instead of a naive one.
-+ Subclasses that override this method may return either kind.
- """
- stat_result = self._stat()
- # NOTE: Historically, this used stat_result[stat.ST_MTIME],
-@@ -2991,7 +2999,9 @@ def get_modified_time(self) -> Optional[datetime.datetime]:
- # consistency with the past (and because we have a unit test
- # that relies on this), we truncate the float here, although
- # I'm not sure that's the right thing to do.
-- modified = datetime.datetime.utcfromtimestamp(int(stat_result.st_mtime))
-+ modified = datetime.datetime.fromtimestamp(
-+ int(stat_result.st_mtime), datetime.timezone.utc
-+ )
- return modified
-
- def get_content_type(self) -> str:
diff --git a/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch b/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
deleted file mode 100644
index 23c210d12f689..0000000000000
--- a/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Taken from https://github.com/tornadoweb/tornado/pull/3335
-
-From 0bfca3f2d72a0c6e5d3ba17caac88a79e7b4e0dd Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 3 Oct 2023 15:08:08 +0100
-Subject: [PATCH] remove calls to utcnow and utcfromtimestamp
-
----
- demos/blog/templates/feed.xml | 2 +-
- demos/s3server/s3server.py | 16 +++++++++++-----
- tornado/web.py | 3 ++-
- 3 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/demos/blog/templates/feed.xml b/demos/blog/templates/feed.xml
-index a98826c8d3..4a4a252f60 100644
---- a/demos/blog/templates/feed.xml
-+++ b/demos/blog/templates/feed.xml
-@@ -5,7 +5,7 @@
- {% if len(entries) > 0 %}
- <updated>{{ max(e.updated for e in entries).strftime(date_format) }}</updated>
- {% else %}
-- <updated>{{ datetime.datetime.utcnow().strftime(date_format) }}</updated>
-+ <updated>{{ datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).strftime(date_format) }}</updated>
- {% end %}
- <id>http://{{ request.host }}/</id>
- <link rel="alternate" href="http://{{ request.host }}/" title="{{ handler.settings["blog_title"] }}" type="text/html"/>
-diff --git a/demos/s3server/s3server.py b/demos/s3server/s3server.py
-index 5c5e6af2ba..104a7c8f81 100644
---- a/demos/s3server/s3server.py
-+++ b/demos/s3server/s3server.py
-@@ -138,7 +138,9 @@ def get(self):
- buckets.append(
- {
- "Name": name,
-- "CreationDate": datetime.datetime.utcfromtimestamp(info.st_ctime),
-+ "CreationDate": datetime.datetime.fromtimestamp(
-+ info.st_ctime, datetime.timezone.utc
-+ ).replace(tzinfo=None),
- }
- )
- self.render_xml({"ListAllMyBucketsResult": {"Buckets": {"Bucket": buckets}}})
-@@ -183,9 +185,10 @@ def get(self, bucket_name):
- info = os.stat(object_path)
- c.update(
- {
-- "LastModified": datetime.datetime.utcfromtimestamp(
-- info.st_mtime
-- ),
-+ "LastModified": datetime.datetime.fromtimestamp(
-+ info.st_mtime,
-+ datetime.timezone.utc,
-+ ).replace(tzinfo=None),
- "Size": info.st_size,
- }
- )
-@@ -231,7 +234,10 @@ def get(self, bucket, object_name):
- info = os.stat(path)
- self.set_header("Content-Type", "application/unknown")
- self.set_header(
-- "Last-Modified", datetime.datetime.utcfromtimestamp(info.st_mtime)
-+ "Last-Modified",
-+ datetime.datetime.fromtimestamp(
-+ info.st_mtime, datetime.timezone.utc
-+ ).replace(tzinfo=None),
- )
- with open(path, "rb") as object_file:
- self.finish(object_file.read())
-diff --git a/tornado/web.py b/tornado/web.py
-index 333f736808..4416e2013e 100644
---- a/tornado/web.py
-+++ b/tornado/web.py
-@@ -2797,7 +2797,8 @@ def set_headers(self) -> None:
- if cache_time > 0:
- self.set_header(
- "Expires",
-- datetime.datetime.utcnow() + datetime.timedelta(seconds=cache_time),
-+ datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
-+ + datetime.timedelta(seconds=cache_time),
- )
- self.set_header("Cache-Control", "max-age=" + str(cache_time))
-
diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index 65bc0e55ac83e..dcb3ce06d7dbc 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,6 +1,6 @@
# Template file for 'python3-tornado'
pkgname=python3-tornado
-version=6.3.3
+version=6.4
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@@ -8,12 +8,12 @@ makedepends="python3-devel"
depends="python3 ca-certificates"
checkdepends="python3-curl python3-pycares python3-Twisted"
short_desc="Python3 web framework and asynchronous networking library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="Apache-2.0"
homepage="http://www.tornadoweb.org/"
changelog="https://www.tornadoweb.org/en/stable/releases.html"
distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe
+checksum=72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee
do_check() {
# There is one instance of test_bind_source_ip (the one for
From 43e7b29d303a3889e7befb715f0e67cee8c0d346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:13 -0300
Subject: [PATCH 7/7] python3-ipython_ipykernel: update to 6.27.1.
---
srcpkgs/python3-ipython_ipykernel/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 340082b9518fe..db4f68c7ffc12 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ipython_ipykernel'
pkgname=python3-ipython_ipykernel
-version=6.27.0
+version=6.27.1
revision=1
build_style=python3-pep517
# these tests fail in 6.26.0
@@ -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=7f4986f606581be73bfb32dc7a1ac9fa0e804c9be50ddf1c7a119413e982693f
+checksum=7d5d594b6690654b4d299edba5e872dc17bb7396a8d0609c97cb7b8a1c605de6
if [ "$XBPS_CHECK_PKGS" = full ]; then
# this would cause a build-time circular dependency
@@ -33,6 +33,11 @@ else
"
fi
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ # Also fails "on Windows and MacOS Python 3.8+" so just disable it
+ make_check_args+=" --deselect tests/test_kernel.py::test_subprocess_print"
+fi
+
post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
2023-12-22 19:22 ` tornaria
2023-12-22 20:15 ` [PR PATCH] [Updated] " tornaria
@ 2023-12-22 22:38 ` tornaria
2023-12-22 22:43 ` tornaria
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2023-12-22 22:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]
There is an updated pull request by tornaria against master on the void-packages repository
https://github.com/tornaria/void-packages ipython
https://github.com/void-linux/void-packages/pull/47875
Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
I tested it with sagemath on x86_64 (full check, with -K; ftr, there is one unrelated and unimportant test failure in sage/calculus/calculus.py).
Full changelog:
- python3-pexpect: update to 4.9.0, adopt.
- python3-traitlets: update to 5.14.0.
- python3-ipython: update to 8.19.0.
- python3-nest_asyncio: update to 1.5.8.
- python3-psutil: update to 5.9.7, add check.
- python3-tornado: update to 6.4, adopt.
- python3-ipython_ipykernel: update to 6.27.1.
@ahesford
<!--
#### 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/47875.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ipython-47875.patch --]
[-- Type: text/x-diff, Size: 33191 bytes --]
From 4c61ea6857d0dce053b9dfee4408cc4e640595e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 22 Dec 2023 10:18:37 -0300
Subject: [PATCH 1/7] python3-pexpect: update to 4.9.0, adopt.
---
srcpkgs/python3-pexpect/template | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
diff --git a/srcpkgs/python3-pexpect/template b/srcpkgs/python3-pexpect/template
index 9ff33710ccf53..cb77bc58a366a 100644
--- a/srcpkgs/python3-pexpect/template
+++ b/srcpkgs/python3-pexpect/template
@@ -1,27 +1,19 @@
# Template file for 'python3-pexpect'
pkgname=python3-pexpect
-version=4.8.0
-revision=4
+version=4.9.0
+revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-ptyprocess"
-checkdepends="python3-pytest python3-ptyprocess mdocml"
-short_desc="Python3 module for spawning child applications and controlling them"
-maintainer="Orphaned <orphan@voidlinux.org>"
+checkdepends="$depends python3-pytest mdocml zsh"
+short_desc="Spawn child applications and control them"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="ISC"
homepage="https://pexpect.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/pexpect/pexpect/master/doc/history.rst"
distfiles="${PYPI_SITE}/p/pexpect/pexpect-${version}.tar.gz"
-checksum=fc65a43959d153d0114afe13997d439c22823a27cefceb5ff35c2178c6784c0c
-
-do_check() {
- # the mdcocml is for test
- # REPLWrapTestCase.test_pager_as_cat
- python3 -m pytest
-}
+checksum=ee7d41123f3c9911050ea2c2dac107568dc43b2d3b0c7557a33212c398ead30f
post_install() {
- # drop asyncio stuff from python2
- # https://github.com/pexpect/pexpect/issues/290
- rm -f ${DESTDIR}/usr/lib/python$py3_ver/site-packages/pexpect/_async.py
vlicense LICENSE
}
From 1d4280b3d211a794b315244d9152024d6529e719 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:04 -0300
Subject: [PATCH 2/7] python3-traitlets: update to 5.14.0.
---
srcpkgs/python3-traitlets/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-traitlets/template b/srcpkgs/python3-traitlets/template
index 3f418299ccf2f..6069bde7055ca 100644
--- a/srcpkgs/python3-traitlets/template
+++ b/srcpkgs/python3-traitlets/template
@@ -1,6 +1,6 @@
# Template file for 'python3-traitlets'
pkgname=python3-traitlets
-version=5.13.0
+version=5.14.0
revision=1
build_style=python3-pep517
# needs python3-pytest-mypy
@@ -14,7 +14,7 @@ license="BSD-3-Clause"
homepage="https://github.com/ipython/traitlets"
changelog="https://raw.githubusercontent.com/ipython/traitlets/main/CHANGELOG.md"
distfiles="${PYPI_SITE}/t/traitlets/traitlets-${version}.tar.gz"
-checksum=9b232b9430c8f57288c1024b34a8f0251ddcc47268927367a0dd3eeaca40deb5
+checksum=fcdaa8ac49c04dfa0ed3ee3384ef6dfdb5d6f3741502be247279407679296772
post_install() {
vlicense LICENSE
From c2cd11ec369706fd7560a31498da3e3fa06df810 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:12 -0300
Subject: [PATCH 3/7] python3-ipython: update to 8.19.0.
---
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 c74bc4e28341c..038128536d5eb 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.18.0
+version=8.19.0
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=4feb61210160f75e229ce932dbf8b719bff37af123c0b985fd038b14233daa16
+checksum=ac4da4ecf0042fb4e0ce57c60430c2db3c719fa8bdf92f8631d6bd8a5785d1f0
conflicts="python-ipython<=5.8.0_2"
make_check_pre="env PYTHONPATH=."
From e63c5c35a72e250643c32c1000b441379fe3f894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sun, 17 Dec 2023 08:38:32 -0300
Subject: [PATCH 4/7] python3-nest_asyncio: update to 1.5.8.
---
srcpkgs/python3-nest_asyncio/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-nest_asyncio/template b/srcpkgs/python3-nest_asyncio/template
index c273dde98ed0d..a27114ab7e271 100644
--- a/srcpkgs/python3-nest_asyncio/template
+++ b/srcpkgs/python3-nest_asyncio/template
@@ -1,7 +1,7 @@
# Template file for 'python3-nest_asyncio'
pkgname=python3-nest_asyncio
-version=1.5.6
-revision=2
+version=1.5.8
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools_scm python3-wheel"
depends="python3"
@@ -11,7 +11,7 @@ maintainer="dkwo <nicolopiazzalunga@gmail.com>"
license="BSD-2-Clause"
homepage="https://github.com/erdewit/nest_asyncio"
distfiles="${PYPI_SITE}/n/nest_asyncio/nest_asyncio-${version}.tar.gz"
-checksum=d267cc1ff794403f7df692964d1d2a3fa9418ffea2a3f6859a439ff482fef290
+checksum=25aa2ca0d2a5b5531956b9e273b45cf664cae2b145101d73b86b199978d48fdb
post_install() {
vlicense LICENSE
From d78c9839a64ceb7d734d2bc4fbeb94806fe0f963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 22 Dec 2023 13:33:44 -0300
Subject: [PATCH 5/7] python3-psutil: update to 5.9.7, add check.
---
srcpkgs/python3-psutil/template | 50 +++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/python3-psutil/template b/srcpkgs/python3-psutil/template
index 936f1b99fb972..b2b6d73c3b320 100644
--- a/srcpkgs/python3-psutil/template
+++ b/srcpkgs/python3-psutil/template
@@ -1,20 +1,58 @@
# Template file for 'python3-psutil'
pkgname=python3-psutil
-version=5.9.6
+version=5.9.7
revision=1
-build_style=python3-module
-hostmakedepends="python3-setuptools"
+build_style=python3-pep517
+# Failing tests: see https://github.com/giampaolo/psutil/issues/2043
+make_check_args="--import-mode=importlib
+ --deselect psutil/tests/test_contracts.py::TestFetchAllProcesses::test_all
+ --deselect psutil/tests/test_linux.py::TestProcess::test_exe_mocked
+ --deselect psutil/tests/test_linux.py::TestRootFsDeviceFinder::test_against_findmnt
+ --deselect psutil/tests/test_linux.py::TestSystemVirtualMemoryAgainstFree::test_used
+ --deselect psutil/tests/test_linux.py::TestSystemVirtualMemoryAgainstVmstat::test_used
+ --deselect psutil/tests/test_misc.py::TestCommonModule::test_debug
+ --deselect psutil/tests/test_process.py::TestProcess::test_terminal
+ --deselect psutil/tests/test_system.py::TestDiskAPIs::test_disk_partitions
+ --deselect psutil/tests/test_system.py::TestMiscAPIs::test_users"
+hostmakedepends="python3-setuptools python3-wheel"
makedepends="python3-devel"
depends="python3"
+# two tests use `util-linux` (findmnt), but it conflicts `chroot-util-linux`
+checkdepends="python3-pytest procps-ng inetutils-ifconfig"
short_desc="Cross-platform process and system utilities module for Python3"
maintainer="skmpz <dem.procopiou@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/giampaolo/psutil"
changelog="https://raw.githubusercontent.com/giampaolo/psutil/master/HISTORY.rst"
distfiles="${PYPI_SITE}/p/psutil/psutil-${version}.tar.gz"
-checksum=e4b92ddcd7dd4cdd3f900180ea1e104932c7bce234fb88976e2a3b296441225a
-# Tests seem to assume package is installed
-make_check=no
+checksum=3f02134e82cfb5d089fddf20bb2e03fd5cd52395321d1c8458a9e58500ff417c
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ # This test fails because RLIMIT_RTTIME is n/a in musl 1.1
+ make_check_args+=" --deselect
+ psutil/tests/test_contracts.py::TestAvailConstantsAPIs::test_rlimit"
+fi
+
+if [ "$XBPS_BUILD_ENVIRONMENT" = void-packages-ci ]; then
+ # Tests that fail on CI; the first one actually hangs!
+ make_check_args+="
+ --deselect psutil/tests/test_process.py::TestProcess::test_wait_non_children
+ --deselect psutil/tests/test_linux.py::TestRootFsDeviceFinder::test_comparisons
+ --deselect psutil/tests/test_linux.py::TestRootFsDeviceFinder::test_disk_partitions_mocked
+ --deselect psutil/tests/test_process.py::TestProcess::test_children_recursive
+ --deselect psutil/tests/test_process.py::TestProcess::test_oneshot_cache
+ --deselect psutil/tests/test_process.py::TestProcess::test_parent_multi
+ --deselect psutil/tests/test_process.py::TestProcess::test_parents
+ --deselect psutil/tests/test_process.py::TestProcess::test_parents_and_children
+ --deselect psutil/tests/test_process.py::TestProcess::test_zombie_process
+ --deselect psutil/tests/test_testutils.py::TestProcessUtils::test_reap_children
+ --deselect psutil/tests/test_testutils.py::TestProcessUtils::test_spawn_children_pair
+ --deselect psutil/tests/test_testutils.py::TestProcessUtils::test_spawn_zombie
+ --deselect psutil/tests/test_testutils.py::TestProcessUtils::test_terminate
+ --deselect psutil/tests/test_testutils.py::TestMemLeakClass::test_leak_mem
+ --deselect psutil/tests/test_process.py::TestPopen::test_misc
+ "
+fi
post_install() {
rm -r ${DESTDIR}/${py3_sitelib}/psutil/tests/
From 929402f4f4511f5c163f8f15952f2ea98098814f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Tue, 5 Dec 2023 21:13:00 -0300
Subject: [PATCH 6/7] python3-tornado: update to 6.4, adopt.
---
.../patches/3288-utcnow-deprecation.patch | 378 ------------------
.../patches/3335-utcnow-deprecation.patch | 81 ----
srcpkgs/python3-tornado/template | 6 +-
3 files changed, 3 insertions(+), 462 deletions(-)
delete mode 100644 srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
delete mode 100644 srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
diff --git a/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch b/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
deleted file mode 100644
index 19e7ff9714e5d..0000000000000
--- a/srcpkgs/python3-tornado/patches/3288-utcnow-deprecation.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-Taken from https://github.com/tornadoweb/tornado/pull/3288
-
-From 4d4d80c1d076dcb4e051c969ae4b66557d3856b8 Mon Sep 17 00:00:00 2001
-From: Ben Darnell <ben@bendarnell.com>
-Date: Thu, 8 Jun 2023 22:52:19 -0400
-Subject: [PATCH] *: Adapt to deprecation of datetime utc methods
-
-Python 3.12 deprecates the utcnow and utcfromtimestamp methods and
-discourages the use of naive datetimes to represent UTC. This was
-previously the main way that Tornado used datetimes (since it was
-the only option available in Python 2 before the introduction
-of datetime.timezone.utc in Python 3.2).
-
-- httpclient_test: Test-only change to test that both kinds of datetimes
- are supported in If-Modified-Since (this just calls
- httputil.format_timestamp)
-- httputil: No functional changes, but format_timestamp's
- support for both naive and aware datetimes is now tested.
-- locale: format_timestamp now supports aware datetimes (in
- addition to the existing support for naive datetimes).
-- web: Cookie expirations internally use aware datetimes.
- StaticFileHandler.get_modified_time now supports both and the
- standard implementation returns aware.
-
-It feels fragile that "naive" and "aware" datetimes are not distinct
-types but subject to data-dependent behavior. This change uses
-"aware" datetimes throughout Tornado, but some operations (comparisons
-and subtraction) fail with mixed datetime types and if I missed any
-in this change may cause errors if naive datetimes were used (where
-previously naive datetimes would have been required). But that's
-apparently the API we have to work with.
----
- tornado/httputil.py | 3 +-
- tornado/locale.py | 12 +++--
- tornado/test/httpclient_test.py | 12 ++++-
- tornado/test/httputil_test.py | 26 +++++++++-
- tornado/test/locale_test.py | 88 ++++++++++++++++++---------------
- tornado/test/web_test.py | 25 +++++-----
- tornado/web.py | 28 +++++++----
- 7 files changed, 126 insertions(+), 68 deletions(-)
-
-diff --git a/tornado/httputil.py b/tornado/httputil.py
-index 9c341d47cc..b21d8046c4 100644
---- a/tornado/httputil.py
-+++ b/tornado/httputil.py
-@@ -856,7 +856,8 @@ def format_timestamp(
-
- The argument may be a numeric timestamp as returned by `time.time`,
- a time tuple as returned by `time.gmtime`, or a `datetime.datetime`
-- object.
-+ object. Naive `datetime.datetime` objects are assumed to represent
-+ UTC; aware objects are converted to UTC before formatting.
-
- >>> format_timestamp(1359312200)
- 'Sun, 27 Jan 2013 18:43:20 GMT'
-diff --git a/tornado/locale.py b/tornado/locale.py
-index 55072af28d..c5526703b1 100644
---- a/tornado/locale.py
-+++ b/tornado/locale.py
-@@ -333,7 +333,7 @@ def format_date(
- shorter: bool = False,
- full_format: bool = False,
- ) -> str:
-- """Formats the given date (which should be GMT).
-+ """Formats the given date.
-
- By default, we return a relative time (e.g., "2 minutes ago"). You
- can return an absolute date string with ``relative=False``.
-@@ -343,10 +343,16 @@ def format_date(
-
- This method is primarily intended for dates in the past.
- For dates in the future, we fall back to full format.
-+
-+ .. versionchanged:: 6.4
-+ Aware `datetime.datetime` objects are now supported (naive
-+ datetimes are still assumed to be UTC).
- """
- if isinstance(date, (int, float)):
-- date = datetime.datetime.utcfromtimestamp(date)
-- now = datetime.datetime.utcnow()
-+ date = datetime.datetime.fromtimestamp(date, datetime.timezone.utc)
-+ if date.tzinfo is None:
-+ date = date.replace(tzinfo=datetime.timezone.utc)
-+ now = datetime.datetime.now(datetime.timezone.utc)
- if date > now:
- if relative and (date - now).seconds < 60:
- # Due to click skew, things are some things slightly
-diff --git a/tornado/test/httpclient_test.py b/tornado/test/httpclient_test.py
-index a71ec0afb6..a41040e64a 100644
---- a/tornado/test/httpclient_test.py
-+++ b/tornado/test/httpclient_test.py
-@@ -28,7 +28,7 @@
- from tornado.log import gen_log, app_log
- from tornado import netutil
- from tornado.testing import AsyncHTTPTestCase, bind_unused_port, gen_test, ExpectLog
--from tornado.test.util import skipOnTravis
-+from tornado.test.util import skipOnTravis, ignore_deprecation
- from tornado.web import Application, RequestHandler, url
- from tornado.httputil import format_timestamp, HTTPHeaders
-
-@@ -887,7 +887,15 @@ def test_body_setter(self):
- self.assertEqual(request.body, utf8("foo"))
-
- def test_if_modified_since(self):
-- http_date = datetime.datetime.utcnow()
-+ http_date = datetime.datetime.now(datetime.timezone.utc)
-+ request = HTTPRequest("http://example.com", if_modified_since=http_date)
-+ self.assertEqual(
-+ request.headers, {"If-Modified-Since": format_timestamp(http_date)}
-+ )
-+
-+ def test_if_modified_since_naive_deprecated(self):
-+ with ignore_deprecation():
-+ http_date = datetime.datetime.utcnow()
- request = HTTPRequest("http://example.com", if_modified_since=http_date)
- self.assertEqual(
- request.headers, {"If-Modified-Since": format_timestamp(http_date)}
-diff --git a/tornado/test/httputil_test.py b/tornado/test/httputil_test.py
-index 8424491d87..aa9b6ee253 100644
---- a/tornado/test/httputil_test.py
-+++ b/tornado/test/httputil_test.py
-@@ -13,6 +13,7 @@
- from tornado.escape import utf8, native_str
- from tornado.log import gen_log
- from tornado.testing import ExpectLog
-+from tornado.test.util import ignore_deprecation
-
- import copy
- import datetime
-@@ -412,8 +413,29 @@ def test_time_tuple(self):
- self.assertEqual(9, len(tup))
- self.check(tup)
-
-- def test_datetime(self):
-- self.check(datetime.datetime.utcfromtimestamp(self.TIMESTAMP))
-+ def test_utc_naive_datetime(self):
-+ self.check(
-+ datetime.datetime.fromtimestamp(
-+ self.TIMESTAMP, datetime.timezone.utc
-+ ).replace(tzinfo=None)
-+ )
-+
-+ def test_utc_naive_datetime_deprecated(self):
-+ with ignore_deprecation():
-+ self.check(datetime.datetime.utcfromtimestamp(self.TIMESTAMP))
-+
-+ def test_utc_aware_datetime(self):
-+ self.check(
-+ datetime.datetime.fromtimestamp(self.TIMESTAMP, datetime.timezone.utc)
-+ )
-+
-+ def test_other_aware_datetime(self):
-+ # Other timezones are ignored; the timezone is always printed as GMT
-+ self.check(
-+ datetime.datetime.fromtimestamp(
-+ self.TIMESTAMP, datetime.timezone(datetime.timedelta(hours=-4))
-+ )
-+ )
-
-
- # HTTPServerRequest is mainly tested incidentally to the server itself,
-diff --git a/tornado/test/locale_test.py b/tornado/test/locale_test.py
-index ee74cb05e8..a2e0872b8f 100644
---- a/tornado/test/locale_test.py
-+++ b/tornado/test/locale_test.py
-@@ -91,45 +91,55 @@ def test_format_date(self):
- locale.format_date(date, full_format=True), "April 28, 2013 at 6:35 pm"
- )
-
-- now = datetime.datetime.utcnow()
--
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(seconds=2), full_format=False),
-- "2 seconds ago",
-- )
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(minutes=2), full_format=False),
-- "2 minutes ago",
-- )
-- self.assertEqual(
-- locale.format_date(now - datetime.timedelta(hours=2), full_format=False),
-- "2 hours ago",
-- )
--
-- self.assertEqual(
-- locale.format_date(
-- now - datetime.timedelta(days=1), full_format=False, shorter=True
-- ),
-- "yesterday",
-- )
--
-- date = now - datetime.timedelta(days=2)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- locale._weekdays[date.weekday()],
-- )
--
-- date = now - datetime.timedelta(days=300)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- "%s %d" % (locale._months[date.month - 1], date.day),
-- )
--
-- date = now - datetime.timedelta(days=500)
-- self.assertEqual(
-- locale.format_date(date, full_format=False, shorter=True),
-- "%s %d, %d" % (locale._months[date.month - 1], date.day, date.year),
-- )
-+ aware_dt = datetime.datetime.now(datetime.timezone.utc)
-+ naive_dt = aware_dt.replace(tzinfo=None)
-+ for name, now in {"aware": aware_dt, "naive": naive_dt}.items():
-+ with self.subTest(dt=name):
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(seconds=2), full_format=False
-+ ),
-+ "2 seconds ago",
-+ )
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(minutes=2), full_format=False
-+ ),
-+ "2 minutes ago",
-+ )
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(hours=2), full_format=False
-+ ),
-+ "2 hours ago",
-+ )
-+
-+ self.assertEqual(
-+ locale.format_date(
-+ now - datetime.timedelta(days=1),
-+ full_format=False,
-+ shorter=True,
-+ ),
-+ "yesterday",
-+ )
-+
-+ date = now - datetime.timedelta(days=2)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ locale._weekdays[date.weekday()],
-+ )
-+
-+ date = now - datetime.timedelta(days=300)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ "%s %d" % (locale._months[date.month - 1], date.day),
-+ )
-+
-+ date = now - datetime.timedelta(days=500)
-+ self.assertEqual(
-+ locale.format_date(date, full_format=False, shorter=True),
-+ "%s %d, %d" % (locale._months[date.month - 1], date.day, date.year),
-+ )
-
- def test_friendly_number(self):
- locale = tornado.locale.get("en_US")
-diff --git a/tornado/test/web_test.py b/tornado/test/web_test.py
-index 56900d9a00..fb9c3417b9 100644
---- a/tornado/test/web_test.py
-+++ b/tornado/test/web_test.py
-@@ -404,10 +404,10 @@ def test_set_cookie_expires_days(self):
- match = re.match("foo=bar; expires=(?P<expires>.+); Path=/", header)
- assert match is not None
-
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=10)
-- parsed = email.utils.parsedate(match.groupdict()["expires"])
-- assert parsed is not None
-- header_expires = datetime.datetime(*parsed[:6])
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=10
-+ )
-+ header_expires = email.utils.parsedate_to_datetime(match.groupdict()["expires"])
- self.assertTrue(abs((expires - header_expires).total_seconds()) < 10)
-
- def test_set_cookie_false_flags(self):
-@@ -1697,11 +1697,10 @@ def get(self):
-
- def test_date_header(self):
- response = self.fetch("/")
-- parsed = email.utils.parsedate(response.headers["Date"])
-- assert parsed is not None
-- header_date = datetime.datetime(*parsed[:6])
-+ header_date = email.utils.parsedate_to_datetime(response.headers["Date"])
- self.assertTrue(
-- header_date - datetime.datetime.utcnow() < datetime.timedelta(seconds=2)
-+ header_date - datetime.datetime.now(datetime.timezone.utc)
-+ < datetime.timedelta(seconds=2)
- )
-
-
-@@ -3010,10 +3009,12 @@ def test_xsrf_httponly(self):
- match = re.match(".*; expires=(?P<expires>.+);.*", header)
- assert match is not None
-
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=2)
-- parsed = email.utils.parsedate(match.groupdict()["expires"])
-- assert parsed is not None
-- header_expires = datetime.datetime(*parsed[:6])
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=2
-+ )
-+ header_expires = email.utils.parsedate_to_datetime(match.groupdict()["expires"])
-+ if header_expires.tzinfo is None:
-+ header_expires = header_expires.replace(tzinfo=datetime.timezone.utc)
- self.assertTrue(abs((expires - header_expires).total_seconds()) < 10)
-
-
-diff --git a/tornado/web.py b/tornado/web.py
-index 565140493e..439e02c47b 100644
---- a/tornado/web.py
-+++ b/tornado/web.py
-@@ -647,7 +647,9 @@ def set_cookie(
- if domain:
- morsel["domain"] = domain
- if expires_days is not None and not expires:
-- expires = datetime.datetime.utcnow() + datetime.timedelta(days=expires_days)
-+ expires = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(
-+ days=expires_days
-+ )
- if expires:
- morsel["expires"] = httputil.format_timestamp(expires)
- if path:
-@@ -698,7 +700,9 @@ def clear_cookie(self, name: str, **kwargs: Any) -> None:
- raise TypeError(
- f"clear_cookie() got an unexpected keyword argument '{excluded_arg}'"
- )
-- expires = datetime.datetime.utcnow() - datetime.timedelta(days=365)
-+ expires = datetime.datetime.now(datetime.timezone.utc) - datetime.timedelta(
-+ days=365
-+ )
- self.set_cookie(name, value="", expires=expires, **kwargs)
-
- def clear_all_cookies(self, **kwargs: Any) -> None:
-@@ -2812,12 +2816,12 @@ def should_return_304(self) -> bool:
- # content has not been modified
- ims_value = self.request.headers.get("If-Modified-Since")
- if ims_value is not None:
-- date_tuple = email.utils.parsedate(ims_value)
-- if date_tuple is not None:
-- if_since = datetime.datetime(*date_tuple[:6])
-- assert self.modified is not None
-- if if_since >= self.modified:
-- return True
-+ if_since = email.utils.parsedate_to_datetime(ims_value)
-+ if if_since.tzinfo is None:
-+ if_since = if_since.replace(tzinfo=datetime.timezone.utc)
-+ assert self.modified is not None
-+ if if_since >= self.modified:
-+ return True
-
- return False
-
-@@ -2981,6 +2985,10 @@ def get_modified_time(self) -> Optional[datetime.datetime]:
- object or None.
-
- .. versionadded:: 3.1
-+
-+ .. versionchanged:: 6.4
-+ Now returns an aware datetime object instead of a naive one.
-+ Subclasses that override this method may return either kind.
- """
- stat_result = self._stat()
- # NOTE: Historically, this used stat_result[stat.ST_MTIME],
-@@ -2991,7 +2999,9 @@ def get_modified_time(self) -> Optional[datetime.datetime]:
- # consistency with the past (and because we have a unit test
- # that relies on this), we truncate the float here, although
- # I'm not sure that's the right thing to do.
-- modified = datetime.datetime.utcfromtimestamp(int(stat_result.st_mtime))
-+ modified = datetime.datetime.fromtimestamp(
-+ int(stat_result.st_mtime), datetime.timezone.utc
-+ )
- return modified
-
- def get_content_type(self) -> str:
diff --git a/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch b/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
deleted file mode 100644
index 23c210d12f689..0000000000000
--- a/srcpkgs/python3-tornado/patches/3335-utcnow-deprecation.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-Taken from https://github.com/tornadoweb/tornado/pull/3335
-
-From 0bfca3f2d72a0c6e5d3ba17caac88a79e7b4e0dd Mon Sep 17 00:00:00 2001
-From: Thomas Grainger <tagrain@gmail.com>
-Date: Tue, 3 Oct 2023 15:08:08 +0100
-Subject: [PATCH] remove calls to utcnow and utcfromtimestamp
-
----
- demos/blog/templates/feed.xml | 2 +-
- demos/s3server/s3server.py | 16 +++++++++++-----
- tornado/web.py | 3 ++-
- 3 files changed, 14 insertions(+), 7 deletions(-)
-
-diff --git a/demos/blog/templates/feed.xml b/demos/blog/templates/feed.xml
-index a98826c8d3..4a4a252f60 100644
---- a/demos/blog/templates/feed.xml
-+++ b/demos/blog/templates/feed.xml
-@@ -5,7 +5,7 @@
- {% if len(entries) > 0 %}
- <updated>{{ max(e.updated for e in entries).strftime(date_format) }}</updated>
- {% else %}
-- <updated>{{ datetime.datetime.utcnow().strftime(date_format) }}</updated>
-+ <updated>{{ datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None).strftime(date_format) }}</updated>
- {% end %}
- <id>http://{{ request.host }}/</id>
- <link rel="alternate" href="http://{{ request.host }}/" title="{{ handler.settings["blog_title"] }}" type="text/html"/>
-diff --git a/demos/s3server/s3server.py b/demos/s3server/s3server.py
-index 5c5e6af2ba..104a7c8f81 100644
---- a/demos/s3server/s3server.py
-+++ b/demos/s3server/s3server.py
-@@ -138,7 +138,9 @@ def get(self):
- buckets.append(
- {
- "Name": name,
-- "CreationDate": datetime.datetime.utcfromtimestamp(info.st_ctime),
-+ "CreationDate": datetime.datetime.fromtimestamp(
-+ info.st_ctime, datetime.timezone.utc
-+ ).replace(tzinfo=None),
- }
- )
- self.render_xml({"ListAllMyBucketsResult": {"Buckets": {"Bucket": buckets}}})
-@@ -183,9 +185,10 @@ def get(self, bucket_name):
- info = os.stat(object_path)
- c.update(
- {
-- "LastModified": datetime.datetime.utcfromtimestamp(
-- info.st_mtime
-- ),
-+ "LastModified": datetime.datetime.fromtimestamp(
-+ info.st_mtime,
-+ datetime.timezone.utc,
-+ ).replace(tzinfo=None),
- "Size": info.st_size,
- }
- )
-@@ -231,7 +234,10 @@ def get(self, bucket, object_name):
- info = os.stat(path)
- self.set_header("Content-Type", "application/unknown")
- self.set_header(
-- "Last-Modified", datetime.datetime.utcfromtimestamp(info.st_mtime)
-+ "Last-Modified",
-+ datetime.datetime.fromtimestamp(
-+ info.st_mtime, datetime.timezone.utc
-+ ).replace(tzinfo=None),
- )
- with open(path, "rb") as object_file:
- self.finish(object_file.read())
-diff --git a/tornado/web.py b/tornado/web.py
-index 333f736808..4416e2013e 100644
---- a/tornado/web.py
-+++ b/tornado/web.py
-@@ -2797,7 +2797,8 @@ def set_headers(self) -> None:
- if cache_time > 0:
- self.set_header(
- "Expires",
-- datetime.datetime.utcnow() + datetime.timedelta(seconds=cache_time),
-+ datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
-+ + datetime.timedelta(seconds=cache_time),
- )
- self.set_header("Cache-Control", "max-age=" + str(cache_time))
-
diff --git a/srcpkgs/python3-tornado/template b/srcpkgs/python3-tornado/template
index 65bc0e55ac83e..dcb3ce06d7dbc 100644
--- a/srcpkgs/python3-tornado/template
+++ b/srcpkgs/python3-tornado/template
@@ -1,6 +1,6 @@
# Template file for 'python3-tornado'
pkgname=python3-tornado
-version=6.3.3
+version=6.4
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@@ -8,12 +8,12 @@ makedepends="python3-devel"
depends="python3 ca-certificates"
checkdepends="python3-curl python3-pycares python3-Twisted"
short_desc="Python3 web framework and asynchronous networking library"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
license="Apache-2.0"
homepage="http://www.tornadoweb.org/"
changelog="https://www.tornadoweb.org/en/stable/releases.html"
distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=e7d8db41c0181c80d76c982aacc442c0783a2c54d6400fe028954201a2e032fe
+checksum=72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee
do_check() {
# There is one instance of test_bind_source_ip (the one for
From a06501360b882ee03a4ce226c80999ae29dea5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Sat, 2 Dec 2023 11:26:13 -0300
Subject: [PATCH 7/7] python3-ipython_ipykernel: update to 6.27.1.
---
srcpkgs/python3-ipython_ipykernel/template | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-ipython_ipykernel/template b/srcpkgs/python3-ipython_ipykernel/template
index 340082b9518fe..db4f68c7ffc12 100644
--- a/srcpkgs/python3-ipython_ipykernel/template
+++ b/srcpkgs/python3-ipython_ipykernel/template
@@ -1,6 +1,6 @@
# Template file for 'python3-ipython_ipykernel'
pkgname=python3-ipython_ipykernel
-version=6.27.0
+version=6.27.1
revision=1
build_style=python3-pep517
# these tests fail in 6.26.0
@@ -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=7f4986f606581be73bfb32dc7a1ac9fa0e804c9be50ddf1c7a119413e982693f
+checksum=7d5d594b6690654b4d299edba5e872dc17bb7396a8d0609c97cb7b8a1c605de6
if [ "$XBPS_CHECK_PKGS" = full ]; then
# this would cause a build-time circular dependency
@@ -33,6 +33,11 @@ else
"
fi
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+ # Also fails "on Windows and MacOS Python 3.8+" so just disable it
+ make_check_args+=" --deselect tests/test_kernel.py::test_subprocess_print"
+fi
+
post_install() {
vlicense LICENSE
}
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
` (2 preceding siblings ...)
2023-12-22 22:38 ` tornaria
@ 2023-12-22 22:43 ` tornaria
2023-12-23 2:25 ` tornaria
2023-12-23 3:18 ` [PR PATCH] [Merged]: " ahesford
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2023-12-22 22:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 557 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/47875#issuecomment-1868113413
Comment:
It turns out there was one test in psutil that hangs in CI. A bunch of other tests in psutil also fail in CI. I just disabled all of the failing tests conditional on void-packages-ci, this should work now (it worked here: https://github.com/tornaria/void-packages/pull/9). I'm not in the mood to dig deeper, upstream doesn't seem to care much about robust testing (https://github.com/giampaolo/psutil/issues/2043).
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
` (3 preceding siblings ...)
2023-12-22 22:43 ` tornaria
@ 2023-12-23 2:25 ` tornaria
2023-12-23 3:18 ` [PR PATCH] [Merged]: " ahesford
5 siblings, 0 replies; 7+ messages in thread
From: tornaria @ 2023-12-23 2:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New comment by tornaria on void-packages repository
https://github.com/void-linux/void-packages/pull/47875#issuecomment-1868176954
Comment:
@ahesford this is good to go now
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Merged]: Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
` (4 preceding siblings ...)
2023-12-23 2:25 ` tornaria
@ 2023-12-23 3:18 ` ahesford
5 siblings, 0 replies; 7+ messages in thread
From: ahesford @ 2023-12-23 3:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]
There's a merged pull request on the void-packages repository
Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies.
https://github.com/void-linux/void-packages/pull/47875
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
I tested it with sagemath on x86_64 (full check, with -K; ftr, there is one unrelated and unimportant test failure in sage/calculus/calculus.py).
Full changelog:
- python3-pexpect: update to 4.9.0, adopt.
- python3-traitlets: update to 5.14.0.
- python3-ipython: update to 8.19.0.
- python3-nest_asyncio: update to 1.5.8.
- python3-psutil: update to 5.9.7, add check.
- python3-tornado: update to 6.4, adopt.
- python3-ipython_ipykernel: update to 6.27.1.
@ahesford
<!--
#### 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] 7+ messages in thread
end of thread, other threads:[~2023-12-23 3:18 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-22 18:09 [PR PATCH] Update ipython to 8.19.0, ipython_kipykernel to 6.27.1, and some dependencies tornaria
2023-12-22 19:22 ` tornaria
2023-12-22 20:15 ` [PR PATCH] [Updated] " tornaria
2023-12-22 22:38 ` tornaria
2023-12-22 22:43 ` tornaria
2023-12-23 2:25 ` tornaria
2023-12-23 3:18 ` [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).