diff options
Diffstat (limited to 'dev-python/test_server')
| -rw-r--r-- | dev-python/test_server/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/test_server/files/test_server-0.0.31-fix-py3.10.patch | 20 | ||||
| -rw-r--r-- | dev-python/test_server/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-python/test_server/test_server-0.0.31.ebuild | 22 |
4 files changed, 32 insertions, 17 deletions
diff --git a/dev-python/test_server/Manifest b/dev-python/test_server/Manifest index 8b5ff15b9d69..2e053a7bc3e6 100644 --- a/dev-python/test_server/Manifest +++ b/dev-python/test_server/Manifest @@ -1,3 +1,4 @@ +AUX test_server-0.0.31-fix-py3.10.patch 588 BLAKE2B a577a527c480b219dddf705f29c58a051abe54359912bccaca5bfe2fb1572841a3e99a402fd2c5e922c7d944e262d7aedd3ddb5f9bd45b5085b9fe2662d5ad74 SHA512 0fb0f45f2f95439298d759016b58579851a43c7151bd16afa23abf5998fec367f7d1645a2a6c84f5dc1d72363d18be7c37dbe13c46df7bcdb79cefe0d7a45b07 DIST test_server-0.0.31.tar.gz 18578 BLAKE2B a08c23a7db43f1c99a0cd270852d9ea841e0c0e9888d1d4a95b8879b436f8c016d1d10222127fc8024fe3560340fd65dc629677106a18c7bc01a565c85a6702e SHA512 f245165f6326e63fae6e51ae247cedade41a391c505d9899c00b886df192326aac32f2a479d322de079f77b252cf199746a7ea3e06089cab105646d194d4d775 -EBUILD test_server-0.0.31.ebuild 841 BLAKE2B 38f2aabf0d6d0482c1bbcb3bd3aae26649573ec9755b8ddd4eaca3b8ed61d9e9b8651212b652dbcd0fa4926874ee9b744e804cd0e8e3e0512664e993cc9d10c7 SHA512 f50ac6be57c1d5ca0a5209d296b143e8acd8ba565b1191dd4ca12e20b3dbb6e6a27812138a0f6950bd307cba9715bf67f07d802d1579e37ec261d66dcfcef0da -MISC metadata.xml 350 BLAKE2B eac07dbe885b393b46453fb6f57f1c9fa1858b1acb170fec98c0a1b31e2e41c2a44fe80dc5675a45e2df8834143471f76b2069a4a86edf1f2cf2b7118e66e99c SHA512 8e280ee3ecef5ff286935d365c9a9df8bdbd6be49e63cbfc71cc299f9f2ab3326511de6884ca61d60c81e746a5994d9e99e97c40be4d82e07c74323a0fdd2868 +EBUILD test_server-0.0.31.ebuild 648 BLAKE2B feb888abd83ba3683502293cd7b65112297962d3e4015553a39c7da2e2796be4c8bc06288afcfae01c2c77002381ca03674cd0c58be42fae7340218a5b23628d SHA512 c6bf249f9f9efcfaea954cdae184d95a7270a107588d48f7d437d79d2e8afa02f44cdc1baba4c8b95dff2c8b6657d6a7e5395981713e458180e942926dd91bb5 +MISC metadata.xml 396 BLAKE2B dbd1bd74407b845564441cabf1a986776fe39c643d5babc210f03f85c0e87396ce076bfd5040a222eb2c4a72cf2bcf22fd32428b6999ac152c1673919d6814f8 SHA512 da7967dd1fe3d6a082bf6375dbbd8f361e3e69b5daea32437fbc492ac6dd10fb815761a9640ea25acf71e6c5c3dad470dc812b256c972237659f29e007eba206 diff --git a/dev-python/test_server/files/test_server-0.0.31-fix-py3.10.patch b/dev-python/test_server/files/test_server-0.0.31-fix-py3.10.patch new file mode 100644 index 000000000000..755a641440a5 --- /dev/null +++ b/dev-python/test_server/files/test_server-0.0.31-fix-py3.10.patch @@ -0,0 +1,20 @@ +From: Karthikeyan Singaravelan <tir.karthi@gmail.com> +Date: Fri, 10 Apr 2020 06:30:21 +0000 +Subject: [PATCH] Import ABC from collections.abc instead of collections for + Python 3 compatibility. + +--- a/test_server/server.py ++++ b/test_server/server.py +@@ -6,7 +6,11 @@ + import time + import types + from six.moves.urllib.parse import urljoin +-from collections import defaultdict, Iterable ++from collections import defaultdict ++try: ++ from collections.abc import Iterable ++except ImportError: ++ from collections import Iterable + + import six + from webtest.http import StopableWSGIServer diff --git a/dev-python/test_server/metadata.xml b/dev-python/test_server/metadata.xml index 9b8d050bac1c..553848e247ec 100644 --- a/dev-python/test_server/metadata.xml +++ b/dev-python/test_server/metadata.xml @@ -3,7 +3,9 @@ <pkgmetadata> <maintainer type="project"> <email>python@gentoo.org</email> + <name>Python</name> </maintainer> + <stabilize-allarches/> <upstream> <remote-id type="pypi">test-server</remote-id> <remote-id type="github">lorien/test_server</remote-id> diff --git a/dev-python/test_server/test_server-0.0.31.ebuild b/dev-python/test_server/test_server-0.0.31.ebuild index 720653069947..7767107a8591 100644 --- a/dev-python/test_server/test_server-0.0.31.ebuild +++ b/dev-python/test_server/test_server-0.0.31.ebuild @@ -1,9 +1,9 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{7,8} pypy3 ) +PYTHON_COMPAT=( python3_{8..10} pypy3 ) inherit distutils-r1 DESCRIPTION="Server to test HTTP clients" @@ -13,22 +13,14 @@ SRC_URI="https://github.com/lorien/test_server/archive/v${PV}.tar.gz -> ${P}.tar LICENSE="MIT" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="" RDEPEND=" >=dev-python/bottle-0.12.13[${PYTHON_USEDEP}] dev-python/six[${PYTHON_USEDEP}] dev-python/webtest[${PYTHON_USEDEP}]" -distutils_enable_tests pytest - -src_prepare() { - distutils-r1_src_prepare +PATCHES=( + "${FILESDIR}/${P}-fix-py3.10.patch" +) - # broken on py2.7, upstream knows - sed -i -e '5a\ -import sys' \ - -e '/test_null_bytes/i\ -@pytest.mark.skipif(sys.hexversion < 0x03000000, reason="broken on py2")' \ - test/server.py || die -} +distutils_enable_tests pytest |