From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12BC4138359 for ; Sat, 12 Sep 2020 22:58:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 855FFE0896; Sat, 12 Sep 2020 22:58:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C272E0896 for ; Sat, 12 Sep 2020 22:58:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 629F8340C4B for ; Sat, 12 Sep 2020 22:58:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3B1336A for ; Sat, 12 Sep 2020 22:58:26 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1599951501.c24c654c3d877d497cb5c224b437547fea5b4a1c.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/jsonpickle/, dev-python/jsonpickle/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/jsonpickle/files/jsonpickle-1.4.1-importlib-metadata.patch dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild X-VCS-Directories: dev-python/jsonpickle/ dev-python/jsonpickle/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c24c654c3d877d497cb5c224b437547fea5b4a1c X-VCS-Branch: master Date: Sat, 12 Sep 2020 22:58:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c8dd227-c88f-4310-b005-b95dcb67c233 X-Archives-Hash: 906b970a39e3a9059343bc08a3dd8c1c commit: c24c654c3d877d497cb5c224b437547fea5b4a1c Author: Michał Górny gentoo org> AuthorDate: Sat Sep 12 22:52:05 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Sep 12 22:58:21 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c24c654c dev-python/jsonpickle: Backport importlib_metadata fix + add dep Backport a fix not to require importlib_metadata in py3.8+, and add a missing dep on it for earlier implementations. Signed-off-by: Michał Górny gentoo.org> .../jsonpickle-1.4.1-importlib-metadata.patch | 44 ++++++++++++++++++++++ ...-1.4.1-r1.ebuild => jsonpickle-1.4.1-r2.ebuild} | 7 ++++ 2 files changed, 51 insertions(+) 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 00000000000..eefb41d73d7 --- /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-r2.ebuild similarity index 88% rename from dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild rename to dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild index c990ed01191..752307b9830 100644 --- a/dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild +++ b/dev-python/jsonpickle/jsonpickle-1.4.1-r2.ebuild @@ -23,6 +23,9 @@ 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=" @@ -32,6 +35,10 @@ BDEPEND=" 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