From 6fabd4335e75aedd8dde95c31b9e322518fba96d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 21 Mar 2020 17:29:40 +0100 Subject: [PATCH] dev-python/importlib_metadata: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/importlib_metadata/Manifest | 1 - .../files/importlib_metadata-0.23-py38.patch | 36 -------------- .../importlib_metadata-0.23-r1.ebuild | 49 ------------------- 3 files changed, 86 deletions(-) delete mode 100644 dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch delete mode 100644 dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest index cf938b53123a..1d89f7063e9c 100644 --- a/dev-python/importlib_metadata/Manifest +++ b/dev-python/importlib_metadata/Manifest @@ -1,3 +1,2 @@ -DIST importlib_metadata-0.23.tar.gz 25172 BLAKE2B 8b88081971c658a01fd1c47cc664e54f4b42eb209ac1ce00af1dad5c15f66b661b20fc287abf818d7e4ef2e92447bea713fac6fb89a98d5ea7ba93e74134e4d6 SHA512 56594dfd67733842d83547770a09e12b4e4e3c000b7c9743206e13e4629906bb7271065e03c387f5114bac7f673fc17594d2ef90af23cd34b7ededecaf3fd47a DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0 diff --git a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch b/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch deleted file mode 100644 index f0b8b636543a..000000000000 --- a/dev-python/importlib_metadata/files/importlib_metadata-0.23-py38.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/importlib_metadata/tests/test_main.py b/importlib_metadata/tests/test_main.py -index 38ec884..0ab1cf1 100644 ---- a/importlib_metadata/tests/test_main.py -+++ b/importlib_metadata/tests/test_main.py -@@ -2,11 +2,17 @@ - from __future__ import unicode_literals - - import re -+import sys - import textwrap - import unittest - import importlib - import importlib_metadata - -+if sys.hexversion > 0x3080000: -+ from importlib.metadata import ( -+ Distribution as SysDistribution, -+ ) -+ - from . import fixtures - from .. import ( - Distribution, EntryPoint, MetadataPathFinder, -@@ -157,8 +163,12 @@ class DiscoveryTests(fixtures.EggInfoPkg, - - def test_package_discovery(self): - dists = list(distributions()) -+ if sys.hexversion > 0x3080000: -+ dist_classes = (Distribution, SysDistribution) -+ else: -+ dist_classes = (Distribution) - assert all( -- isinstance(dist, Distribution) -+ isinstance(dist, dist_classes) - for dist in dists - ) - assert any( diff --git a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild b/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild deleted file mode 100644 index bf98c2989273..000000000000 --- a/dev-python/importlib_metadata/importlib_metadata-0.23-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} ) - -inherit distutils-r1 - -DESCRIPTION="Read metadata from Python packages" -HOMEPAGE="https://importlib-metadata.readthedocs.io/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86" -IUSE="test" - -RDEPEND=" - dev-python/zipp[${PYTHON_USEDEP}] - $(python_gen_cond_dep '>=dev-python/configparser-3.5[${PYTHON_USEDEP}]' -2) - $(python_gen_cond_dep 'dev-python/contextlib2[${PYTHON_USEDEP}]' -2) - $(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2) -" -BDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( - ${RDEPEND} - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' pypy{,3} python{2_7,3_{5,6}}) - dev-python/packaging[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}/importlib_metadata-0.23-py38.patch" -) - -distutils_enable_sphinx "${PN}/docs" \ - '>=dev-python/rst-linker-1.9' -distutils_enable_tests unittest - -python_prepare_all() { - # avoid a setuptools_scm dependency - sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die - sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \ - setup.cfg || die - - distutils-r1_python_prepare_all -} -- 2.26.2