public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonpickle/files/, dev-python/jsonpickle/
Date: Sat,  6 Jul 2024 08:33:46 +0000 (UTC)	[thread overview]
Message-ID: <1720254811.c148704befa3582d80b83eb580b315f474f323a6.mgorny@gentoo> (raw)

commit:     c148704befa3582d80b83eb580b315f474f323a6
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 08:13:35 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 08:33:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c148704b

dev-python/jsonpickle: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/jsonpickle/Manifest                     |   2 -
 .../files/jsonpickle-3.2.1-numpy-2.patch           | 157 ---------------------
 dev-python/jsonpickle/jsonpickle-3.0.4.ebuild      |  67 ---------
 dev-python/jsonpickle/jsonpickle-3.2.1.ebuild      |  73 ----------
 4 files changed, 299 deletions(-)

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 5b0f16c3858e..ad17d8f010d8 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1 @@
-DIST jsonpickle-3.0.4.gh.tar.gz 260847 BLAKE2B ba990a59276463b66401cc9fdad2c91dfd18a172fa1cb2f0b89cbeb1a280360f6e1d5bf7cc3ec94069b1d05e4eb11d3fc52a594542f31ead220622aa01e0df99 SHA512 e6ad7ae30cc4d56323b612fcf599109828fcf76acfba266a1bed850a633603edc8829f29d8981659460a9941531d6735375a03775c9d7bd51c210edbf7414b1c
-DIST jsonpickle-3.2.1.gh.tar.gz 319730 BLAKE2B 5309e5d22253844119ce97eecbea3070a69ea20cfdf56fe9021fca470603cddd0ba2e7af1e86bd4830f33b59cf3ab4dd426ae4d0b1dee30af51f8219de68698e SHA512 b3e53b88b5d26178cc0bf6c4da2688c3187adcfb1800bc6a19bfc4ca86eb6f0fd1a0ab899598bf3e75adf20ef930d555756e57de7bf41a2c0c446facf18d1523
 DIST jsonpickle-3.2.2.gh.tar.gz 321994 BLAKE2B 1e126e0f1f336e5b64631a874c379b39665b324ccbc4c87d7becba302568f61df2d576732ea9165514791e6b2dd122e7008d43090d634d4d30fdde5c7d0600f9 SHA512 20e28885e637f8dba5965e22dc9960acb7c10fb25d78f2ba9bf6fb94d55a968e2245d577dbe19a32153e12af2ffa7dad6ae3e1897c426c25fa544796606736a6

diff --git a/dev-python/jsonpickle/files/jsonpickle-3.2.1-numpy-2.patch b/dev-python/jsonpickle/files/jsonpickle-3.2.1-numpy-2.patch
deleted file mode 100644
index 6fdc989d990e..000000000000
--- a/dev-python/jsonpickle/files/jsonpickle-3.2.1-numpy-2.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From 0ab3cf0ffcdb364a8a75e71acfb267e5aaabc0a0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 10 Jun 2024 03:55:47 +0200
-Subject: [PATCH 1/2] Fix data types in tests for NumPy 2
-
-Fix a number of test compatibility issues with NumPy 2.  That is:
-
-- replace `np.float_` with `np.float64`,
-- replace `np.complex_` with `np.complex128`,
-- remove `np.unicode_` as equivalent to `np.str_`.
-
-The LHS types are also aliases to the RHS types in NumPy 1.x, so this
-is NFC on NumPy 1.x.  These aliases were removed in 2.x, so the code
-needs to be updated for tests to pass on NumPy 2.x.
----
- tests/numpy_test.py  |  7 ++-----
- tests/pandas_test.py | 13 +++++--------
- 2 files changed, 7 insertions(+), 13 deletions(-)
-
-diff --git a/tests/numpy_test.py b/tests/numpy_test.py
-index e271725..dd50d5e 100644
---- a/tests/numpy_test.py
-+++ b/tests/numpy_test.py
-@@ -32,9 +32,7 @@ def test_dtype_roundtrip():
-     dtypes = [
-         np.int_,
-         np.int32,
--        np.float_,
-         np.float64,
--        np.complex_,
-         np.complex128,
-         np.str_,
-         np.object_,
-@@ -86,15 +84,14 @@ def test_generic_roundtrip():
-     values = [
-         np.int_(1),
-         np.int32(-2),
--        np.float_(2.5),
-+        np.float64(2.5),
-         np.nan,
-         -np.inf,
-         np.inf,
-         np.datetime64('2014-01-01'),
-         np.str_('foo'),
--        np.unicode_('bar'),
-         np.object_({'a': 'b'}),
--        np.complex_(1 - 2j),
-+        np.complex128(1 - 2j),
-     ]
-     for value in values:
-         decoded = roundtrip(value)
-diff --git a/tests/pandas_test.py b/tests/pandas_test.py
-index 532563f..414bd65 100644
---- a/tests/pandas_test.py
-+++ b/tests/pandas_test.py
-@@ -34,14 +34,13 @@ def test_series_roundtrip():
-     ser = pd.Series(
-         {
-             'an_int': np.int_(1),
--            'a_float': np.float_(2.5),
-+            'a_float': np.float64(2.5),
-             'a_nan': np.nan,
-             'a_minus_inf': -np.inf,
-             'an_inf': np.inf,
-             'a_str': np.str_('foo'),
--            'a_unicode': np.unicode_('bar'),
-             'date': np.datetime64('2014-01-01'),
--            'complex': np.complex_(1 - 2j),
-+            'complex': np.complex128(1 - 2j),
-             # TODO: the following dtypes are not currently supported.
-             # 'object': np.object_({'a': 'b'}),
-         }
-@@ -54,14 +53,13 @@ def test_dataframe_roundtrip():
-     df = pd.DataFrame(
-         {
-             'an_int': np.int_([1, 2, 3]),
--            'a_float': np.float_([2.5, 3.5, 4.5]),
-+            'a_float': np.float64([2.5, 3.5, 4.5]),
-             'a_nan': np.array([np.nan] * 3),
-             'a_minus_inf': np.array([-np.inf] * 3),
-             'an_inf': np.array([np.inf] * 3),
-             'a_str': np.str_('foo'),
--            'a_unicode': np.unicode_('bar'),
-             'date': np.array([np.datetime64('2014-01-01')] * 3, dtype="datetime64[s]"),
--            'complex': np.complex_([1 - 2j, 2 - 1.2j, 3 - 1.3j]),
-+            'complex': np.complex128([1 - 2j, 2 - 1.2j, 3 - 1.3j]),
-             # TODO: the following dtypes are not currently supported.
-             # 'object': np.object_([{'a': 'b'}]*3),
-         }
-@@ -76,12 +74,11 @@ def test_multindex_dataframe_roundtrip():
-             'idx_lvl0': ['a', 'b', 'c'],
-             'idx_lvl1': np.int_([1, 1, 2]),
-             'an_int': np.int_([1, 2, 3]),
--            'a_float': np.float_([2.5, 3.5, 4.5]),
-+            'a_float': np.float64([2.5, 3.5, 4.5]),
-             'a_nan': np.array([np.nan] * 3),
-             'a_minus_inf': np.array([-np.inf] * 3),
-             'an_inf': np.array([np.inf] * 3),
-             'a_str': np.str_('foo'),
--            'a_unicode': np.unicode_('bar'),
-         }
-     )
-     df = df.set_index(['idx_lvl0', 'idx_lvl1'])
-
-From 8bc2bdd42bc111d90edbcef8005640d5a51627bf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 10 Jun 2024 04:02:17 +0200
-Subject: [PATCH 2/2] Fix `newbyteorder()` use for NumPy 2.x
-
-Replace the `arr.newbyteorder()` use with:
-
-    arr.view(arr.dtype.newbyteorder())
-
-as suggested in the exception that's raised when the tests are run
-in NumPy 2.x.  With this change, the code works both with NumPy 1.x
-and NumPy 2.x.
----
- tests/numpy_test.py | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/tests/numpy_test.py b/tests/numpy_test.py
-index dd50d5e..2e6725b 100644
---- a/tests/numpy_test.py
-+++ b/tests/numpy_test.py
-@@ -306,18 +306,22 @@ def test_immutable():
- def test_byteorder():
-     """Test the byteorder for text and binary encodings"""
-     # small arr is stored as text
--    a = np.arange(10).newbyteorder()
--    b = a[:].newbyteorder()
--    _a, _b = roundtrip([a, b])
--    npt.assert_array_equal(a, _a)
--    npt.assert_array_equal(b, _b)
-+    a = np.arange(10)
-+    av = a.view(a.dtype.newbyteorder())
-+    b = a[:]
-+    bv = b.view(b.dtype.newbyteorder())
-+    _av, _bv = roundtrip([av, bv])
-+    npt.assert_array_equal(av, _av)
-+    npt.assert_array_equal(bv, _bv)
- 
-     # bigger arr is stored as binary
--    a = np.arange(100).newbyteorder()
--    b = a[:].newbyteorder()
--    _a, _b = roundtrip([a, b])
--    npt.assert_array_equal(a, _a)
--    npt.assert_array_equal(b, _b)
-+    a = np.arange(100)
-+    av = a.view(a.dtype.newbyteorder())
-+    b = a[:]
-+    bv = b.view(b.dtype.newbyteorder())
-+    _av, _bv = roundtrip([av, bv])
-+    npt.assert_array_equal(av, _av)
-+    npt.assert_array_equal(bv, _bv)
- 
- 
- def test_zero_dimensional_array():

diff --git a/dev-python/jsonpickle/jsonpickle-3.0.4.ebuild b/dev-python/jsonpickle/jsonpickle-3.0.4.ebuild
deleted file mode 100644
index abb12598169d..000000000000
--- a/dev-python/jsonpickle/jsonpickle-3.0.4.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="
-	https://github.com/jsonpickle/jsonpickle/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -i -e 's:--cov::' pytest.ini || die
-	distutils-r1_python_prepare_all
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-	)
-
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}

diff --git a/dev-python/jsonpickle/jsonpickle-3.2.1.ebuild b/dev-python/jsonpickle/jsonpickle-3.2.1.ebuild
deleted file mode 100644
index 155b209d25ad..000000000000
--- a/dev-python/jsonpickle/jsonpickle-3.2.1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python library for serializing any arbitrary object graph into JSON"
-HOMEPAGE="
-	https://github.com/jsonpickle/jsonpickle/
-	https://pypi.org/project/jsonpickle/
-"
-SRC_URI="
-	https://github.com/jsonpickle/jsonpickle/archive/refs/tags/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/feedparser[${PYTHON_USEDEP}]
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/sqlalchemy[${PYTHON_USEDEP}]
-		dev-python/ujson[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	local PATCHES=(
-		# https://github.com/jsonpickle/jsonpickle/pull/512
-		"${FILESDIR}/${P}-numpy-2.patch"
-	)
-
-	distutils-r1_python_prepare_all
-
-	sed -i -e 's:--cov::' pytest.ini || die
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	local EPYTEST_IGNORE=(
-		# unpackaged bson dependency
-		tests/bson_test.py
-	)
-
-	if ! has_version "dev-python/gmpy[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/gmpy.py )
-	fi
-	if ! has_version "dev-python/pandas[${PYTHON_USEDEP}]"; then
-		EPYTEST_IGNORE+=( jsonpickle/ext/pandas.py )
-	fi
-
-	epytest
-}
-
-pkg_postinst() {
-	# Unpackaged optional backends: yajl, demjson
-	optfeature "encoding numpy-based data" dev-python/numpy
-	optfeature "encoding pandas objects" dev-python/pandas
-	optfeature "fast JSON backend" dev-python/simplejson
-}


             reply	other threads:[~2024-07-06  8:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-06  8:33 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-17  9:02 [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonpickle/files/, dev-python/jsonpickle/ Michał Górny

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1720254811.c148704befa3582d80b83eb580b315f474f323a6.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox