Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pycountry/, dev-python/pycountry/files/
Date: Sat, 09 Apr 2022 18:42:35
Message-Id: 1649529573.acda04ed3cf5b8c802ff5c1aa0642545fc036d09.mgorny@gentoo
1 commit: acda04ed3cf5b8c802ff5c1aa0642545fc036d09
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 9 18:39:33 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 9 18:39:33 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acda04ed
7
8 dev-python/pycountry: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/pycountry/Manifest | 1 -
13 .../pycountry-20.7.3-fix-tests-for-pypy3.patch | 21 -----------------
14 dev-python/pycountry/pycountry-22.1.10.ebuild | 26 ----------------------
15 3 files changed, 48 deletions(-)
16
17 diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest
18 index 4ef03cb28200..67cf2540522f 100644
19 --- a/dev-python/pycountry/Manifest
20 +++ b/dev-python/pycountry/Manifest
21 @@ -1,2 +1 @@
22 -DIST pycountry-22.1.10.tar.gz 10060795 BLAKE2B 51672b2e08e48528797e57e6a546261d4ceee0af364d5c943f243a5956008ffc417b02e553f376c252bfbfbf76af40585c9f910815a9c2943ff88be6fb9d4180 SHA512 93e5737df29affe5bbf8a2aa2caef59727adcc198eab301a5ddbc4275e32955cec0de9ab2820470a8cf87b0c0a9d48bfddd18411d93a700212aba8372e5a52b4
23 DIST pycountry-22.3.5.tar.gz 10141551 BLAKE2B d645eade8ce9be3b99f4f2b189cc50c3395ecb3899ab9fa668066993abbfa576191cfcc05b7bb2764d088a86df492770bcc0a8834f04e6fde58a01defe8a1b14 SHA512 07dc507ee94f1880727761df197f81704386d9246163c9a5872f47083d37c7d1205dfbd28c6663ef0731a0b05277ade03a1a1929ab84087e0e85c05028c68b89
24
25 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
26 deleted file mode 100644
27 index 453c57f362cd..000000000000
28 --- a/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch
29 +++ /dev/null
30 @@ -1,21 +0,0 @@
31 -commit 57a64b69704640bd85270d886c369ef5a31eee80
32 -Author: Louis Sautier <sautier.louis@×××××.com>
33 -Date: Thu Sep 17 13:01:07 2020 +0200
34 -
35 - Do not rely on CPython-specific __builtins__ for tests
36 -
37 - This makes test_locales pass with PyPy3.
38 -
39 -diff --git a/src/pycountry/tests/test_general.py b/src/pycountry/tests/test_general.py
40 -index ea697ae..ad1090f 100644
41 ---- a/src/pycountry/tests/test_general.py
42 -+++ b/src/pycountry/tests/test_general.py
43 -@@ -149,7 +149,7 @@ def test_locales():
44 - german = gettext.translation(
45 - 'iso3166', pycountry.LOCALES_DIR, languages=['de'])
46 - german.install()
47 -- assert __builtins__['_']('Germany') == 'Deutschland'
48 -+ assert _('Germany') == 'Deutschland'
49 -
50 -
51 - def test_removed_countries():
52
53 diff --git a/dev-python/pycountry/pycountry-22.1.10.ebuild b/dev-python/pycountry/pycountry-22.1.10.ebuild
54 deleted file mode 100644
55 index 01aa2ed2d9eb..000000000000
56 --- a/dev-python/pycountry/pycountry-22.1.10.ebuild
57 +++ /dev/null
58 @@ -1,26 +0,0 @@
59 -# Copyright 1999-2022 Gentoo Authors
60 -# Distributed under the terms of the GNU General Public License v2
61 -
62 -EAPI=8
63 -
64 -PYTHON_COMPAT=( pypy3 python3_{8..10} )
65 -# The package uses pkg_resources to determine its version
66 -DISTUTILS_USE_SETUPTOOLS=manual
67 -
68 -inherit distutils-r1
69 -
70 -DESCRIPTION="Database of countries, subdivisions, languages, currencies and script"
71 -HOMEPAGE="https://github.com/flyingcircusio/pycountry"
72 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
73 -
74 -LICENSE="LGPL-2.1"
75 -SLOT="0"
76 -KEYWORDS="amd64 arm64 ~ia64 ppc ~riscv ~sparc x86"
77 -
78 -RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
79 -BDEPEND="${RDEPEND}"
80 -
81 -distutils_enable_tests --install pytest
82 -
83 -# https://github.com/flyingcircusio/pycountry/pull/51
84 -PATCHES=( "${FILESDIR}/pycountry-20.7.3-fix-tests-for-pypy3.patch" )