From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- dev-python/cherrypy/Manifest | 3 +- dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild | 78 ++++++++++++++++++++++ dev-python/cherrypy/cherrypy-18.6.1.ebuild | 57 ---------------- .../cherrypy/files/cherrypy-18.6.1-py311.patch | 32 +++++++++ 4 files changed, 112 insertions(+), 58 deletions(-) create mode 100644 dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild delete mode 100644 dev-python/cherrypy/cherrypy-18.6.1.ebuild create mode 100644 dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch (limited to 'dev-python/cherrypy') diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest index 21137ca15d7d..51e15c29ff20 100644 --- a/dev-python/cherrypy/Manifest +++ b/dev-python/cherrypy/Manifest @@ -1,4 +1,5 @@ AUX cherrypy-18.6.1-close-files.patch 15776 BLAKE2B 8205e3db173706e749d9adc83d4784f7af928c5cf22f3e044d7675861048d95093d97db2db42dd9f84681a33f0b95b782f1c273f7a06eb2000c832306a7375b1 SHA512 8d4b2ee002bff97a0b80d2b03089873ceb97a861a1133e97ce210de4a18ebbe73ebc82e7f261102caa13ad57cd25398b2f213d4ac29925ed86ad64a8ca09acc6 +AUX cherrypy-18.6.1-py311.patch 1078 BLAKE2B 7518be839f56493dc3960472bdf0fad663490382ebce956c3cf8f2917c93e6b6672bdd654afe162f447f4ce907b1d122d5fdd90b30a9c130564fae7419246cc6 SHA512 31d00c5bc29491f57d4e663211bcc6c2292ca1eaff41c7be6ee5b6af0802875cb82fcc110c16c852989acec40c4c5bbc6ae0bddecc5afbfde2e8c571a767846e DIST CherryPy-18.6.1.tar.gz 692730 BLAKE2B 44cef7ed54a090df396691001b794bf13be2c61003bf80b63223e3a42914ce50fcfe43c06626fb881105e3ed6fbf587df7024bbf7cfde00a8263c432f4cc7ae4 SHA512 186a0992a443e1ffc1a2924b3351dcb0e6cc6c88b39ac32330d6365fe1b0a35c2008a3a18e1a57f61ffd1901ea6134333bb6288024d8ffbb1fd8e8dcd3145007 -EBUILD cherrypy-18.6.1.ebuild 1519 BLAKE2B 2bf70272fdca85f50497b07d796b03b3f9c3589ddf646f4426c6438efc1b0a06b188bf9cff5170df004ba49e5ebf883ae211a372caeb6e00e89f1d325949c062 SHA512 050e6e2c769a83d105dd4a79952f75f44bf3ccbb9a90c4b8bbab4b7dcf6f6f80d73027000b6c2a8ac7a51c89a012c4c587588e32474ffda603e912c54afa90f9 +EBUILD cherrypy-18.6.1-r1.ebuild 1950 BLAKE2B 1d40c7f6d31c9641ae503df5705e5465941befa8f6ce24adf0e976778dd023d73218902ab35d0c271e7cd9ee52cd5bfa57dbefaaa0b982623f6e2d74ec460ba3 SHA512 d6b60880219efb9eec875a01f4c8549c225edfb1c789a1fb2927b1d3d285a216f67400dfd4dd929ee9b9de52277dd1c5e08ef6eccbeb72f6207388812042bcb5 MISC metadata.xml 347 BLAKE2B 7694118d09caebdeac890ee40fd8a79906637bb695f9ec44dc25e67378c8c7f06901e5c52e6f79dd498921ffa01b18b9762b102baeea34792a2ff730a1303c40 SHA512 29cbadf45008c3c422c47ca232634bd15efbd4bcdc6065d18cf1adcbc0c3bbb155a2b122eb4ce7180839fcdaf4acb5515486f191ebbfa63eaec8a14abbb1e3eb diff --git a/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild new file mode 100644 index 000000000000..e8c592b55252 --- /dev/null +++ b/dev-python/cherrypy/cherrypy-18.6.1-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{8..11} pypy3 ) + +inherit distutils-r1 + +MY_PN="CherryPy" +MY_P=${MY_PN}-${PV} +DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework" +HOMEPAGE=" + https://cherrypy.dev/ + https://github.com/cherrypy/cherrypy/ + https://pypi.org/project/CherryPy/ +" +SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="BSD" +SLOT="0" +KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~riscv x86" +IUSE="ssl test" + +RDEPEND=" + >=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}] + >=dev-python/portend-2.1.1[${PYTHON_USEDEP}] + dev-python/more-itertools[${PYTHON_USEDEP}] + dev-python/zc-lockfile[${PYTHON_USEDEP}] + dev-python/jaraco-collections[${PYTHON_USEDEP}] + ssl? ( + dev-python/pyopenssl[${PYTHON_USEDEP}] + ) +" +BDEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + test? ( + dev-python/routes[${PYTHON_USEDEP}] + dev-python/simplejson[${PYTHON_USEDEP}] + dev-python/objgraph[${PYTHON_USEDEP}] + dev-python/path-py[${PYTHON_USEDEP}] + dev-python/requests-toolbelt[${PYTHON_USEDEP}] + dev-python/pytest-services[${PYTHON_USEDEP}] + ) +" + +distutils_enable_tests pytest + +python_prepare_all() { + local PATCHES=( + # https://github.com/cherrypy/cherrypy/pull/1946 + "${FILESDIR}"/${P}-close-files.patch + "${FILESDIR}"/${P}-py311.patch + ) + + sed -r -e '/(pytest-sugar|pytest-cov)/ d' \ + -i setup.py || die + + sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \ + -e 's:--cov[[:graph:]]+::g' \ + -e 's:--doctest[[:graph:]]+::g' \ + -i pytest.ini || die + + distutils-r1_python_prepare_all +} + +python_test() { + local EPYTEST_DESELECT=() + [[ ${EPYTHON} == python3.11 ]] && EPYTEST_DESELECT+=( + # broken by changes in traceback output + cherrypy/test/test_request_obj.py::RequestObjectTests::testErrorHandling + cherrypy/test/test_tools.py::ToolTests::testHookErrors + ) + + epytest +} diff --git a/dev-python/cherrypy/cherrypy-18.6.1.ebuild b/dev-python/cherrypy/cherrypy-18.6.1.ebuild deleted file mode 100644 index d1177e6159ad..000000000000 --- a/dev-python/cherrypy/cherrypy-18.6.1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 - -MY_P="CherryPy-${PV}" - -DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework" -HOMEPAGE="https://cherrypy.dev https://pypi.org/project/CherryPy/" -SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86" -IUSE="ssl test" - -RDEPEND=" - >=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}] - >=dev-python/portend-2.1.1[${PYTHON_USEDEP}] - dev-python/more-itertools[${PYTHON_USEDEP}] - dev-python/zc-lockfile[${PYTHON_USEDEP}] - dev-python/jaraco-collections[${PYTHON_USEDEP}] - ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )" -BDEPEND=" - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - dev-python/routes[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - dev-python/objgraph[${PYTHON_USEDEP}] - dev-python/path-py[${PYTHON_USEDEP}] - dev-python/requests-toolbelt[${PYTHON_USEDEP}] - dev-python/pytest-services[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - # https://github.com/cherrypy/cherrypy/pull/1946 - "${FILESDIR}"/${P}-close-files.patch - ) - - sed -r -e '/(pytest-sugar|pytest-cov)/ d' \ - -i setup.py || die - - sed -r -e 's:--cov-report[[:space:]]+[[:graph:]]+::g' \ - -e 's:--cov[[:graph:]]+::g' \ - -e 's:--doctest[[:graph:]]+::g' \ - -i pytest.ini || die - - distutils-r1_python_prepare_all -} diff --git a/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch b/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch new file mode 100644 index 000000000000..5d629dd8c333 --- /dev/null +++ b/dev-python/cherrypy/files/cherrypy-18.6.1-py311.patch @@ -0,0 +1,32 @@ +From 8245a74aa4e090c40445535a9ce3997ed9904798 Mon Sep 17 00:00:00 2001 +From: Dominic Davis-Foster +Date: Fri, 28 Jan 2022 23:11:52 +0000 +Subject: [PATCH] Switch from inspect.getargspec to inspect.getfullargspec + +inspect.getargspec has been deprecated since 3.0 +--- + cherrypy/_cpdispatch.py | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/cherrypy/_cpdispatch.py b/cherrypy/_cpdispatch.py +index 83eb79cb..5c506e99 100644 +--- a/cherrypy/_cpdispatch.py ++++ b/cherrypy/_cpdispatch.py +@@ -206,12 +206,8 @@ except ImportError: + def test_callable_spec(callable, args, kwargs): # noqa: F811 + return None + else: +- getargspec = inspect.getargspec +- # Python 3 requires using getfullargspec if +- # keyword-only arguments are present +- if hasattr(inspect, 'getfullargspec'): +- def getargspec(callable): +- return inspect.getfullargspec(callable)[:4] ++ def getargspec(callable): ++ return inspect.getfullargspec(callable)[:4] + + + class LateParamPageHandler(PageHandler): +-- +2.35.1 + -- cgit v1.2.3