From 7c59acba5699c9c58090a7a738669669a7307023 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 21 Aug 2021 23:14:26 +0100
Subject: gentoo resync : 21.08.2021

---
 dev-python/jsonpickle/Manifest                |  2 +-
 dev-python/jsonpickle/jsonpickle-2.0.0.ebuild | 60 +++++++++++++++++----------
 2 files changed, 38 insertions(+), 24 deletions(-)

(limited to 'dev-python/jsonpickle')

diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 9ecece38b3c9..1e9eae35f530 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpickle-2.0.0.tar.gz 110336 BLAKE2B 574dab58418c5225a9364836d04eaabf3384e9dab404d191846a4bb41e9c8bbb51243a6a231ec8baf05ff9be337e12b5c96c46b74a327e9f05653ca81bf6ccf2 SHA512 acba11e5dfce116b27edfe0fdccdd74755e299aa43f873dd1ce547d947b58f14c1059c21d04007b5be0857f7ce69fe5355fb2edc47a99cc2217fe00297ca78d3
-EBUILD jsonpickle-2.0.0.ebuild 1332 BLAKE2B 39fa4fab94851065890cf91626fef0676522962727a436b3c0b17fbeffc8bda61a7864612c6e56eaea8fb8dff3ed122ee05f1d45a2dadeef71157471ca69b6d9 SHA512 a6d934dbfaf4bdd7363caa3f83c08a4201983e7103bf520e0bc12ef56fcf690425db18b363203dfa691cf864bc865eb0fc0ef7c97022ed7f96a97891725bb111
+EBUILD jsonpickle-2.0.0.ebuild 1804 BLAKE2B 820a41b7cf66ecc1f52283de7d8c08841e5247284fdf4b7e0a0ad6707fb82d01c3eca25f3aea0a70ab348548baa03643bf638e6725d9d75a360d9e93511ee4ae SHA512 e1a1d707f61a7ea7bf4dad75aec98d4e78dd7d06c6e03d1118b6523a03f67b562b6b560480c94f310a6c2379a568b27caa7839747e36cc00a10bd3b21626daff
 MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
index 629cee7b6893..bbb317b91c9c 100644
--- a/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-2.0.0.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-inherit distutils-r1
+PYTHON_COMPAT=( python3_{8..10} )
+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/"
@@ -15,35 +14,50 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
-# There are optional json backends serializer/deserializers in addition to those selected here
-# jsonlib, yajl.
-RDEPEND="
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' python3_7)
-"
 # toml via setuptools_scm[toml]
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx "docs/source"
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		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}]
+		$(python_gen_cond_dep '
+			dev-python/feedparser[${PYTHON_USEDEP}]
+		' python3_{8,9})
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/jaraco-packaging \
+	dev-python/rst-linker
 distutils_enable_tests pytest
 
 python_prepare_all() {
-	# too many dependencies
-	rm tests/pandas_test.py || die
-	# broken with gmpy
-	rm tests/ecdsa_test.py || die
-
 	sed -i -e 's:--flake8 --black --cov::' pytest.ini || die
-
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	pytest -vv tests || die "Tests failed with ${EPYTHON}"
+	local EPYTEST_IGNORE=(
+		# unpackaged bson dependency
+		tests/bson_test.py
+		# broken when gmpy is installed
+		# https://github.com/jsonpickle/jsonpickle/issues/328
+		# https://github.com/jsonpickle/jsonpickle/issues/316
+		tests/ecdsa_test.py
+	)
+	# There is a problem with packaging feedparser with python 3.10, so skip
+	[[ ${EPYTHON} == python3_10 ]] && EPYTEST_IGNORE+=(
+		tests/feedparser_test.py
+	)
+	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
 }
-- 
cgit v1.2.3