diff options
Diffstat (limited to 'dev-python/mygpoclient')
| -rw-r--r-- | dev-python/mygpoclient/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch | 35 | ||||
| -rw-r--r-- | dev-python/mygpoclient/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-python/mygpoclient/mygpoclient-1.8.ebuild | 36 |
4 files changed, 53 insertions, 25 deletions
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest index c20f6f491b4a..dd72dbb040da 100644 --- a/dev-python/mygpoclient/Manifest +++ b/dev-python/mygpoclient/Manifest @@ -1,4 +1,5 @@ +AUX mygpoclient-1.8-fix-literal.patch 1376 BLAKE2B e538cd673ae420e86cc68a8e8a93a20ab5714e2e44f864b62dfa2b2944fc5ba2c4df780079fac1db1ec531fc819b6c005bb727cd7ec95163f82d82ed6e6d256d SHA512 80409bb7419561e35f6200d0788e4e82c67b29114a5822c18f8559a280c5aab4bdfd3a263c1eeb3ab67ef17e95430e19723a8a8fc890644427811be6cc6ef9c2 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f -EBUILD mygpoclient-1.8.ebuild 1157 BLAKE2B 827f3f549e4cdbc8728a28afd8cebf14cd98f693b252dbd2ce6e52ac9e724e9d4818dc676f3794c2b0e0cc477e5f5aa0d23a32e5bda5507bf19a2eea1c00a94a SHA512 3dc94b52e127213a367e718dea89c7a8a14f23281fb1393a6cfe153a4c0c5371a6136e861f15571b3241337234f5285c6d02527d4b9554809284714d0eee1695 -MISC metadata.xml 429 BLAKE2B da30de45ebd914e61b8ff966c8c2f1cd1873e3acf436b1189072970ede7487d57e07143a5c55db20ed2222395b66997e675f7e56048e6d237d25f1447a711170 SHA512 0b6d35d86f86c99a6e607ef21a60137fff939847b2146428c5f210fb0ef1beba2b5b20da77e4c9a7f623b2644b6cac5318d6346dcca8ab67f9b52b44e8abc90e +EBUILD mygpoclient-1.8.ebuild 836 BLAKE2B fda0a3569b1d605497bf10d6499806acdaf57bbbf70c783e2b35fcc1617535c6ec224ebb3c335d5e11a8b7f03f2bf26b86c3f3aef595ec601f25d8764c2d87d1 SHA512 d694c61cf3b353fc86b00367fd4a8d3d3e8b49b829d1447ffe7b571e567fa9996effa71dc46408d8a4e3e2731e13f99677f74f4972f7a5a553fb53ca020d3563 +MISC metadata.xml 512 BLAKE2B 2ff1435acc5efe1b4390e91957781baa2d555f127de82ceeefb7349f5c4b553a56924e0ecfe698e8a570da8a6d5ef462240a4c5b2f00c65918f2a175596fa9d5 SHA512 c89fef8499773f751d23d33d7c4407be85286ccf88f93f5fdc630a86602de024e2f3cb014837877f7b70012a3dac8625263fa8898aaf5c0675f0fa3afac31b20 diff --git a/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch b/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch new file mode 100644 index 000000000000..372d0bc2bc40 --- /dev/null +++ b/dev-python/mygpoclient/files/mygpoclient-1.8-fix-literal.patch @@ -0,0 +1,35 @@ +From bdf8c8ce38cff8938bab3544c6dbb0d509ce7720 Mon Sep 17 00:00:00 2001 +From: Eric Le Lay <elelay@macports.org> +Date: Sun, 22 Mar 2020 16:19:08 +0100 +Subject: [PATCH] use == for comparison with literal + +See https://bugs.python.org/issue34850 +--- + mygpoclient/locator.py | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mygpoclient/locator.py b/mygpoclient/locator.py +index c0dc9d7..810f973 100644 +--- a/mygpoclient/locator.py ++++ b/mygpoclient/locator.py +@@ -317,17 +317,17 @@ def settings_uri(self, type, scope_param1, scope_param2): + + filename = self._username + '/%(type)s.json' % locals() + +- if type is 'device': ++ if type == 'device': + if scope_param1 is None: + raise ValueError('Devicename not specified') + filename += '?device=%(scope_param1)s' % locals() + +- if type is 'podcast': ++ if type == 'podcast': + if scope_param1 is None: + raise ValueError('Podcast URL not specified') + filename += '?podcast=%s' % quote(scope_param1) + +- if type is 'episode': ++ if type == 'episode': + if (scope_param1 is None) or (scope_param2 is None): + raise ValueError('Podcast or Episode URL not specified') + filename += '?podcast=%s&episode=%s' % (quote(scope_param1), quote(scope_param2)) diff --git a/dev-python/mygpoclient/metadata.xml b/dev-python/mygpoclient/metadata.xml index ce04110e5f36..74f39f449e15 100644 --- a/dev-python/mygpoclient/metadata.xml +++ b/dev-python/mygpoclient/metadata.xml @@ -9,7 +9,9 @@ <email>python@gentoo.org</email> <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">mygpoclient</remote-id> + <remote-id type="github">gpodder/mygpoclient</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild index 9c66b03f5c3a..7992f3b024a2 100644 --- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild +++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) inherit distutils-r1 DESCRIPTION="A gpodder.net client library" @@ -14,34 +14,24 @@ SRC_URI="https://github.com/gpodder/mygpoclient/archive/${PV}.tar.gz -> ${P}.tar LICENSE="GPL-3" SLOT="0" KEYWORDS="amd64 x86" -IUSE="test" -RESTRICT="!test? ( test )" -RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/minimock - ) -" +BDEPEND="test? ( dev-python/minimock[${PYTHON_USEDEP}] )" -PATCHES=( "${FILESDIR}"/${P}-tests.patch ) +PATCHES=( + "${FILESDIR}"/${P}-fix-literal.patch + "${FILESDIR}"/${PN}-1.8-tests.patch +) + +distutils_enable_tests nose src_prepare() { - distutils-r1_src_prepare # Disable tests requring network connection. - rm -f mygpoclient/http_test.py -} + rm mygpoclient/http_test.py || die -python_test() { - if [[ "${EPYTHON:0:4}" == "pypy" ]]; then - nosetests --cover-erase --with-coverage --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/ - else - nosetests --cover-erase --with-coverage --with-doctest --cover-package=mygpoclient "${BUILD_DIR}"/lib/${PN}/ - fi + distutils-r1_src_prepare } src_install() { distutils-r1_src_install - rm -f $(find "${D}" -name "*_test.py") + find "${D}" -name "*_test.py" -delete || die } |