commit: e331738b58191ab205a43da1531dcc9253f4fce7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 30 14:27:49 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Dec 30 14:32:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e331738b
dev-python/cherrypy: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/cherrypy/Manifest | 1 -
dev-python/cherrypy/cherrypy-18.8.0.ebuild | 72 ----------------------
.../cherrypy/files/cherrypy-18.8.0-py312.patch | 30 ---------
3 files changed, 103 deletions(-)
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index a25017177e9a..bf2c0f9f6cf3 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,2 +1 @@
-DIST CherryPy-18.8.0.tar.gz 622679 BLAKE2B
673f9a103a901161ee801656fa37fa0a4fcd2d9276a5231e48c1663264eb7f922d5d862018995a345a8485252416fa0229da49b8d265288efce2dccd37d79ff8
SHA512
abacc995c1757b8d0171d57eb59b6e5931c46019d8f0f43479e334bb4f58b61a27541d9d0997d665f81905bc3c89e42d40d8e5a6e3a5f9bf251bc9089ceb5249
DIST CherryPy-18.9.0.tar.gz 631900 BLAKE2B
5bc0d4315f6b9300ba8fc122858554a6b6476f78ac1fb31b1635707488a4a300e359d2e368dde9996c202a8f42100ef09e298fb923f955e92d7906ed970d2ba9
SHA512
ed2beacedd3417214f45e59567f2a1faf5964745a545360db2f61251a39f50f2a833745832a2c900673029d98062f7e1813db6c342585f8d2bbae0be423edb3a
diff --git a/dev-python/cherrypy/cherrypy-18.8.0.ebuild
b/dev-python/cherrypy/cherrypy-18.8.0.ebuild
deleted file mode 100644
index f1daafcdd228..000000000000
--- a/dev-python/cherrypy/cherrypy-18.8.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYPI_NO_NORMALIZE=1
-PYPI_PN="CherryPy"
-PYTHON_COMPAT=( python3_{10..12} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="CherryPy is a pythonic, object-oriented HTTP framework"
-HOMEPAGE="
- https://cherrypy.dev/
- https://github.com/cherrypy/cherrypy/
- https://pypi.org/project/CherryPy/
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc
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[${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/1959
- "${FILESDIR}/${P}-py312.patch"
- )
-
- sed -i -e '/cov/d' pytest.ini || die
- # upstream has been using xfail to mark flaky tests, then added
- # xfail_strict... not a good idea
- sed -i -e '/xfail_strict/d' 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/files/cherrypy-18.8.0-py312.patch
b/dev-python/cherrypy/files/cherrypy-18.8.0-py312.patch
deleted file mode 100644
index 90e63a763f99..000000000000
--- a/dev-python/cherrypy/files/cherrypy-18.8.0-py312.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d2bc527c12a74675d67ba5fbf9de0d014af929cb Mon Sep 17 00:00:00 2001
-From: Dan Radez <[email protected]>
-Date: Tue, 12 Apr 2022 09:40:46 -0400
-Subject: [PATCH] Replace readfp with read_file
-
-Getting Deprecation Warning in python 3.11:
-DeprecationWarning: This method will be removed in Python 3.12.
-Use 'parser.read_file()' instead.
-
-https://github.com/python/cpython/commit/e8659b47dece5a272111c0af5e340c364a9f807b#diff-ca80d44aeeadd5e4966195b99aff106abb3e7b0b5356b7499125ee021bd84777R757
-
-If I'm reading this correct read_file has been around since Python 2.7
-https://github.com/python/cpython/commit/a492362f9a2a44e411147fd7b2886466bb0bb17f
----
- cherrypy/lib/reprconf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cherrypy/lib/reprconf.py b/cherrypy/lib/reprconf.py
-index 76381d7b7..536b94173 100644
---- a/cherrypy/lib/reprconf.py
-+++ b/cherrypy/lib/reprconf.py
-@@ -188,7 +188,7 @@ def as_dict(self, raw=False, vars=None):
-
- def dict_from_file(self, file):
- if hasattr(file, 'read'):
-- self.readfp(file)
-+ self.read_file(file)
- else:
- self.read(file)
- return self.as_dict()
