commit: 31b5065baba13341de4919133f1847b77014c6bd Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sun Jan 17 08:35:32 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sun Jan 17 08:35:32 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31b5065b
dev-python/jsonpickle: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/jsonpickle/Manifest | 1 - .../jsonpickle-1.4.1-importlib-metadata.patch | 44 ------------------ dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild | 54 ---------------------- 3 files changed, 99 deletions(-) diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest index 0d00e1a606a..883a86a67f0 100644 --- a/dev-python/jsonpickle/Manifest +++ b/dev-python/jsonpickle/Manifest @@ -1,2 +1 @@ -DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35 DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9 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 deleted file mode 100644 index eefb41d73d7..00000000000 --- a/dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 7e5752de7d49f222cec5107aa5044fa8f8ffbb39 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <[email protected]> -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-r2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild deleted file mode 100644 index c81366d06a4..00000000000 --- a/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild +++ /dev/null @@ -1,54 +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=bdepend -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}" -}
