From acda04ed3cf5b8c802ff5c1aa0642545fc036d09 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Sat, 9 Apr 2022 20:39:33 +0200 Subject: dev-python/pycountry: Remove old MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/pycountry/Manifest | 1 - .../pycountry-20.7.3-fix-tests-for-pypy3.patch | 21 ----------------- dev-python/pycountry/pycountry-22.1.10.ebuild | 26 ---------------------- 3 files changed, 48 deletions(-) delete mode 100644 dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch delete mode 100644 dev-python/pycountry/pycountry-22.1.10.ebuild diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest index 4ef03cb28200..67cf2540522f 100644 --- a/dev-python/pycountry/Manifest +++ b/dev-python/pycountry/Manifest @@ -1,2 +1 @@ -DIST pycountry-22.1.10.tar.gz 10060795 BLAKE2B 51672b2e08e48528797e57e6a546261d4ceee0af364d5c943f243a5956008ffc417b02e553f376c252bfbfbf76af40585c9f910815a9c2943ff88be6fb9d4180 SHA512 93e5737df29affe5bbf8a2aa2caef59727adcc198eab301a5ddbc4275e32955cec0de9ab2820470a8cf87b0c0a9d48bfddd18411d93a700212aba8372e5a52b4 DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89 diff --git a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch b/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch deleted file mode 100644 index 453c57f362cd..000000000000 --- a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 57a64b69704640bd85270d886c369ef5a31eee80 -Author: Louis Sautier -Date: Thu Sep 17 13:01:07 2020 +0200 - - Do not rely on CPython-specific __builtins__ for tests - - This makes test_locales pass with PyPy3. - -diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py -index ea697ae..ad1090f 100644 ---- a/src/pycountry/tests/test_general.py -+++ b/src/pycountry/tests/test_general.py -@@ -149,7 +149,7 @@ def test_locales(): - german = gettext.translation( - 'iso3166', pycountry.LOCALES_DIR, languages=['de']) - german.install() -- assert __builtins__['_']('Germany') == 'Deutschland' -+ assert _('Germany') == 'Deutschland' - - - def test_removed_countries(): diff --git a/dev-python/pycountry/pycountry-22.1.10.ebuild b/dev-python/pycountry/pycountry-22.1.10.ebuild deleted file mode 100644 index 01aa2ed2d9eb..000000000000 --- a/dev-python/pycountry/pycountry-22.1.10.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( pypy3 python3_{8..10} ) -# The package uses pkg_resources to determine its version -DISTUTILS_USE_SETUPTOOLS=manual - -inherit distutils-r1 - -DESCRIPTION="Database of countries, subdivisions, languages, currencies and script" -HOMEPAGE="https://github.com/flyingcircusio/pycountry" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm64 ~ia64 ppc ~riscv ~sparc x86" - -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -BDEPEND="${RDEPEND}" - -distutils_enable_tests --install pytest - -# https://github.com/flyingcircusio/pycountry/pull/51 -PATCHES=( "${FILESDIR}/pycountry-20.7.3-fix-tests-for-pypy3.patch" ) -- cgit v1.2.3-65-gdbad