From 41629d42608b33dd4c7d326c7720c2c14c6504ee Mon Sep 17 00:00:00 2001 From: "Andreas Billmeier (@Home/mbp)" Date: Sun, 25 Oct 2020 09:00:13 +0100 Subject: [PATCH] add some forgotten files... --- CHANGELOG.txt | 11 +++++- dev-python/pycountry/Manifest | 4 +++ ...pycountry-20.7.3-fix-tests-for-pypy3.patch | 21 +++++++++++ dev-python/pycountry/metadata.xml | 14 ++++++++ dev-python/pycountry/pycountry-19.8.18.ebuild | 35 +++++++++++++++++++ 5 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 dev-python/pycountry/Manifest create mode 100644 dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch create mode 100644 dev-python/pycountry/metadata.xml create mode 100644 dev-python/pycountry/pycountry-19.8.18.ebuild diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 30b43327f..2a529efff 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -3,6 +3,16 @@ * bump PyXiaomiGateway-0.13.4 * bump HATasmota-0.0.22 * bump spotipy-2.16.1 + * add google-nest-sdm-0.1.6 + * update google-nest-sdm-0.1.9 + * add google-api-core-1.23.0 + * add google-auth-1.22.0 + * update google-auth-1.22.1 + * add grpc-google-iam-v1-0.12.3 + * add google-cloud-pubsub-2.1.0 + * add libcst-0.3.13 + * add proto-plus-1.11.0 + * dg pycountry-19.8.18 from main repo 2020-10-23 homeassistant-0.117.0_beta3 * bump home-assistant-frontend-20201021.2 @@ -10,7 +20,6 @@ * update homeassistant-0.117.0_beta2 * bump bsblan-0.4.0 * bump HATasmota-0.0.21 - * dg pycountry-19.8.18 from main repo * update homeassistant-0.117.0_beta3 * update esphome-1.15.3 diff --git a/dev-python/pycountry/Manifest b/dev-python/pycountry/Manifest new file mode 100644 index 000000000..aa00e7843 --- /dev/null +++ b/dev-python/pycountry/Manifest @@ -0,0 +1,4 @@ +AUX pycountry-20.7.3-fix-tests-for-pypy3.patch 740 BLAKE2B 64113481df5b7fb385604f16d7b3be066a12b6a5e1dab38cdf879101da132bcacf407fdf773d5f15381789114be265c7e1ee3ab880c38dae6e904e6820923ee5 SHA512 0df7756ac4d3dd3ccc409307f21a95021c93851ad3b6ce07ce244eade4957d9906dc6aaabdbafe671cf6f9619623cdd22097119642c0c926376e4991eb6a1a4f +DIST pycountry-19.8.18.tar.gz 10003160 BLAKE2B ac7894e9fc1ed4e8f386cc6e07c1fc2abefee63c39c7c851c100519418606b52bc18be8da672930ceefdc7ca7b51571e4b3884ea0c20e547e5b596e249ebf407 SHA512 39ba06629eeea55460424d06992ca5f1e5bf6168b219dc4880ec326f6aa0c92a4fdc54d4143a8b8bb1490149af793e760e291c6d704104a57ba91e88228ab669 +EBUILD pycountry-19.8.18.ebuild 984 BLAKE2B e3bfda67f8c4db7293941a5d8a5c979364e27b82379d6034c8426e5eb2e2c6c169fd47f0571d59a4af18668bc444c1bfd9d22c25030871b04a876e5072e82fca SHA512 e23279d313c923d451c5407412b506c37d65a7b645a60079218631abe16e3be2695810b53ed05316553672e0655d61609c9d0c9874e3e0889434b4c34bda1428 +MISC metadata.xml 472 BLAKE2B fb2aab31ad673be9f39cc21bcbed26d06525a6bb905855b297f3f4aee7be246db9bab4344dd38dd0e903e63a8548795c26925e742635150600b26cf9f0c563e1 SHA512 83ff7cb703819ed92c8b2ba08ada6941f9accc30208f12ec9c35bf58c4dc772de34bec00646b6f188fe9cddd0d3e89ae540e8d0936629dc2075bf66442986024 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 new file mode 100644 index 000000000..453c57f36 --- /dev/null +++ b/dev-python/pycountry/files/pycountry-20.7.3-fix-tests-for-pypy3.patch @@ -0,0 +1,21 @@ +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/metadata.xml b/dev-python/pycountry/metadata.xml new file mode 100644 index 000000000..da18e7bc6 --- /dev/null +++ b/dev-python/pycountry/metadata.xml @@ -0,0 +1,14 @@ + + + + + python@gentoo.org + Python + + + + pycountry + flyingcircusio/pycountry + https://github.com/flyingcircusio/pycountry/issues + + diff --git a/dev-python/pycountry/pycountry-19.8.18.ebuild b/dev-python/pycountry/pycountry-19.8.18.ebuild new file mode 100644 index 000000000..a8c35f26d --- /dev/null +++ b/dev-python/pycountry/pycountry-19.8.18.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6..9} ) +# 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 ~sparc x86" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +BDEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +# https://github.com/flyingcircusio/pycountry/pull/51 +# PATCHES=( "${FILESDIR}/${P}-fix-tests-for-pypy3.patch" ) + +python_test() { + # The package uses pkg_resources to determine its version + distutils_install_for_testing + pytest -vv || die "Tests fail with ${EPYTHON}" +}