From 9ee6d97c2883d42f204a533a8bc1f4562df778fb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 16 Sep 2020 09:32:48 +0100 Subject: gentoo resync : 16.09.2020 --- dev-python/jsonpickle/Manifest | 3 +- .../jsonpickle-1.4.1-importlib-metadata.patch | 44 ++++++++++++++++++ dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild | 47 ------------------- dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild | 54 ++++++++++++++++++++++ 4 files changed, 100 insertions(+), 48 deletions(-) create mode 100644 dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch delete mode 100644 dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild create mode 100644 dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild (limited to 'dev-python/jsonpickle') diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest index 116e7ea7419d..6794cfcd5e26 100644 --- a/dev-python/jsonpickle/Manifest +++ b/dev-python/jsonpickle/Manifest @@ -1,3 +1,4 @@ +AUX jsonpickle-1.4.1-importlib-metadata.patch 1198 BLAKE2B c37f21cb8102eb1f6ec2bb178a0d38552bf013a4557fff990731a15eec24ced69210c38ac0abe28e7f8dd7707016bee51844faa2acc35b582a9871ca44d87104 SHA512 574ed4cb7492483c516b96b74502ba3b94d66e149000395781f2eee49b5e649bcd4d8f433e2dc257ae74b036ce314c1fd23369c1ac2ea2cdf7c89185d3abc076 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35 -EBUILD jsonpickle-1.4.1-r1.ebuild 1297 BLAKE2B 4c1395725496b24e16429333a0aaa7d726a52b8155a8abb29748fad2362bb797b33ea9bf847df689ff7eb638de138740a4551f28f82fe7b7d211e74a92f60474 SHA512 10537693574be37f87edbe02657c3c97984e7df5d33e76270c774cfc6e2862173efea9aaae6f1bf500c790b395cbe1e995fc6fefd6c7c066b786fd534e335655 +EBUILD jsonpickle-1.4.1-r2.ebuild 1460 BLAKE2B 7b5ef9682327cb6580d4b5964e0a026fbb1c8214177a40b2c3dd5864f1af0bfe7f67baf07d5a9f4a4ec7c92942cf86d5ad84fc1043bb80c30ebf9d6c8effc324 SHA512 d7ce02c29062b3950efc00672edf0b24c76bf28e0f9e09a567512548d5ffc7950c6707e2e82ff3c3e1c99a14d43fed8e188778cbe820ceb5b332e9fbcd7cbbf2 MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759 diff --git a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch b/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch new file mode 100644 index 000000000000..eefb41d73d7c --- /dev/null +++ b/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch @@ -0,0 +1,44 @@ +From 7e5752de7d49f222cec5107aa5044fa8f8ffbb39 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Wed, 22 Apr 2020 20:38:28 +0200 +Subject: [PATCH] Use importlib.metadata from the standard library on Python + 3.8+ + +Fixes https://github.com/jsonpickle/jsonpickle/issues/303 +--- + jsonpickle/version.py | 7 ++++++- + setup.cfg | 2 +- + 2 files changed, 7 insertions(+), 2 deletions(-) + +diff --git a/jsonpickle/version.py b/jsonpickle/version.py +index 01c83c4..92b44b2 100644 +--- a/jsonpickle/version.py ++++ b/jsonpickle/version.py +@@ -1,5 +1,10 @@ ++import sys ++ + try: +- import importlib_metadata as metadata ++ if sys.version_info < (3, 8): ++ import importlib_metadata as metadata ++ else: ++ from importlib import metadata + except (ImportError, OSError): + metadata = None + +diff --git a/setup.cfg b/setup.cfg +index 9f0eab2..46707ec 100644 +--- a/setup.cfg ++++ b/setup.cfg +@@ -36,7 +36,7 @@ packages = find: + include_package_data = true + python_requires = >=2.7 + install_requires = +- importlib_metadata ++ importlib_metadata; python_version<"3.8" + setup_requires = setuptools_scm[toml] >= 3.4.1 + + [options.extras_require] +-- +2.28.0 + diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild deleted file mode 100644 index c990ed01191f..000000000000 --- a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{6..9} ) -DISTUTILS_USE_SETUPTOOLS=rdepend -inherit distutils-r1 - -DESCRIPTION="Python library for serializing any arbitrary object graph into JSON" -HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" -IUSE="doc test" -RESTRICT="!test? ( test )" - -# There are optional json backends serializer/deserializers in addition to those selected here -# jsonlib, yajl. -RDEPEND=" - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/feedparser[${PYTHON_USEDEP}] - dev-python/ujson[${PYTHON_USEDEP}] -" -# toml via setuptools_scm[toml] -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - dev-python/toml[${PYTHON_USEDEP}]" - -distutils_enable_sphinx "docs/source" -distutils_enable_tests pytest - -python_prepare_all() { - # too many dependencies - rm tests/pandas_test.py || die - sed -e '/pandas/ d' -i tests/runtests.py || die - - sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die - - distutils-r1_python_prepare_all -} - -python_test() { - pytest -vv tests || die "Tests failed with ${EPYTHON}" -} diff --git a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild new file mode 100644 index 000000000000..752307b9830b --- /dev/null +++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Python library for serializing any arbitrary object graph into JSON" +HOMEPAGE="https://github.com/jsonpickle/jsonpickle/ https://pypi.org/project/jsonpickle/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux" +IUSE="doc test" +RESTRICT="!test? ( test )" + +# There are optional json backends serializer/deserializers in addition to those selected here +# jsonlib, yajl. +RDEPEND=" + dev-python/simplejson[${PYTHON_USEDEP}] + dev-python/feedparser[${PYTHON_USEDEP}] + dev-python/ujson[${PYTHON_USEDEP}] + $(python_gen_cond_dep ' + dev-python/importlib_metadata[${PYTHON_USEDEP}] + ' python3_{6,7}) +" +# toml via setuptools_scm[toml] +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/toml[${PYTHON_USEDEP}]" + +distutils_enable_sphinx "docs/source" +distutils_enable_tests pytest + +PATCHES=( + "${FILESDIR}"/jsonpickle-1.4.1-importlib-metadata.patch +) + +python_prepare_all() { + # too many dependencies + rm tests/pandas_test.py || die + sed -e '/pandas/ d' -i tests/runtests.py || die + + sed -i -e 's:--flake8 --black --cov --cov-append::' pytest.ini || die + + distutils-r1_python_prepare_all +} + +python_test() { + pytest -vv tests || die "Tests failed with ${EPYTHON}" +} -- cgit v1.2.3