From 864ccd3aba62b24728eb0b963d8a1093555475c0 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 5 Nov 2025 19:02:56 +0000 Subject: Adding metadata --- dev-python/cheroot/Manifest | 4 +- dev-python/cheroot/cheroot-10.0.1.ebuild | 98 ---------------------- dev-python/cheroot/cheroot-11.0.0.ebuild | 1 + dev-python/cheroot/cheroot-11.1.1.ebuild | 92 ++++++++++++++++++++ .../files/cheroot-10.0.1-no-pytest-forked.patch | 72 ---------------- 5 files changed, 96 insertions(+), 171 deletions(-) delete mode 100644 dev-python/cheroot/cheroot-10.0.1.ebuild create mode 100644 dev-python/cheroot/cheroot-11.1.1.ebuild delete mode 100644 dev-python/cheroot/files/cheroot-10.0.1-no-pytest-forked.patch (limited to 'dev-python/cheroot') diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest index 0566680233f2..d2f0a7ccb153 100644 --- a/dev-python/cheroot/Manifest +++ b/dev-python/cheroot/Manifest @@ -1,2 +1,4 @@ -DIST cheroot-10.0.1.tar.gz 167586 BLAKE2B d8c882c3d16d29a2f97f35542321fd0aba4d0f9b310bc1359f9b832362e2d75424077d02d9a810a33a1bd10cf2ba9922a8baf8519dbd04c5e6f9b48edd3c3db1 SHA512 c878647a7bcf564509ee07481b3e371a2e09019d78240e79293bc4e0bfa872e8e2f947925c54eda56cc1790a3ff4d656c70066278c74073b44fc070627f5c71d DIST cheroot-11.0.0.tar.gz 182140 BLAKE2B a33f192373ce9f223b7dc0ee51babfb09da921ec079cac323ca567af5e06aae68487b1977019df805931c868c4986b04c5a6084843602c2424fc58398a2df61d SHA512 143e0f7f5b9dd9a2ad668e7e935a44b41f9b586f0549476cad22a5b8b099b882d3dee0e008f2a53a6305901659e921f3dc788bdecd87a6e487a3539d61b15e20 +DIST cheroot-11.0.0.tar.gz.provenance 9040 BLAKE2B e19fc78bb5f8f4fac35d11a6d86db68a5b00c0e170e386dcb3871f0fc2faa399644aa998acc20b87dd50dcad4f2fc755dbaa5ef6afbd97dc8b9d93942436fb88 SHA512 32eeaf876fccc90fe4858fb4898ccef24d5e8334b09d8092dea830e57b0c606dea8e66a85069285ae7518693dc98e7d1077ed915aa5f475cfbd15baeb8d16ae6 +DIST cheroot-11.1.1.tar.gz 185168 BLAKE2B b3915229c0e922aab460166e8e6b66f2cddeaf9faeee0873a152c1a3f647c1194ef0bdfcbb79221a34a30e2a0c90e4c02e54de2c7429e1f36bb18c2e6472f162 SHA512 890b22ad09c76462c6d4037ff692c6d3c6ea110e020593106dd984e7795366520e3bd041ed08bdb793c3a5c9831206a7c362510b64a86ff3b870b4854c870f1a +DIST cheroot-11.1.1.tar.gz.provenance 9169 BLAKE2B 37018fc55ed66096904e30964ab036912bafeeb5fb56bc26981a46e58f3e9cb9c7019f62ee5a15c093dd52f91bab157f07086fc3ff44eabffb2257d36579385e SHA512 3590256f5cd29a62560cc58ecbf44984072810379aff1eeabe339c4d55232fb8439d7e5d15eb7ccf94e6b25040346eb3ae6d8fb37517e578454546a98a7002ec diff --git a/dev-python/cheroot/cheroot-10.0.1.ebuild b/dev-python/cheroot/cheroot-10.0.1.ebuild deleted file mode 100644 index 0c51c800588a..000000000000 --- a/dev-python/cheroot/cheroot-10.0.1.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..14} ) - -inherit distutils-r1 pypi - -DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy" -HOMEPAGE=" - https://cherrypy.dev/ - https://pypi.org/project/cheroot/ - https://github.com/cherrypy/cheroot/ -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}] - dev-python/jaraco-functools[${PYTHON_USEDEP}] -" -BDEPEND=" - >=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}] - test? ( - dev-python/jaraco-context[${PYTHON_USEDEP}] - dev-python/jaraco-text[${PYTHON_USEDEP}] - dev-python/portend[${PYTHON_USEDEP}] - >=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}] - dev-python/requests-toolbelt[${PYTHON_USEDEP}] - dev-python/requests-unixsocket[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - test-rust? ( - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/trustme[${PYTHON_USEDEP}] - ) - ) -" - -PATCHES=( - # https://github.com/cherrypy/cheroot/pull/703 - "${FILESDIR}/${PN}-10.0.1-no-pytest-forked.patch" -) - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -python_prepare_all() { - sed -e '/--cov/d' \ - -e '/--testmon/d' \ - -e '/--numproc/d' \ - -i pytest.ini || die - - # broken - sed -i -e '/False.*localhost/d' cheroot/test/test_ssl.py || die - # pypytools is py2 stuff - sed -i -e '/pypytools/d' cheroot/test/test_server.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - local EPYTEST_DESELECT=( - # requires pypytools, see above - cheroot/test/test_server.py::test_high_number_of_file_descriptors - # known test failures with OpenSSL 3.2.0 - cheroot/test/test_ssl.py::test_https_over_http_error - # hardcoded errno codes (sigh) - # https://github.com/cherrypy/cheroot/issues/736 - cheroot/test/test_errors.py::test_plat_specific_errors - cheroot/test/test_ssl.py::test_http_over_https_error - ) - - case ${EPYTHON} in - pypy3*) - EPYTEST_DESELECT+=( - # https://github.com/cherrypy/cheroot/issues/695 - cheroot/test/test_conn.py::test_remains_alive_post_unhandled_exception - ) - ;; - esac - - local EPYTEST_IGNORE=() - if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" || - ! has_version "dev-python/trustme[${PYTHON_USEDEP}]" - then - EPYTEST_IGNORE+=( - cheroot/test/test_ssl.py - ) - fi - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - epytest -p pytest_mock -} diff --git a/dev-python/cheroot/cheroot-11.0.0.ebuild b/dev-python/cheroot/cheroot-11.0.0.ebuild index d8b66edb8f5b..584c681608a8 100644 --- a/dev-python/cheroot/cheroot-11.0.0.ebuild +++ b/dev-python/cheroot/cheroot-11.0.0.ebuild @@ -4,6 +4,7 @@ EAPI=8 DISTUTILS_USE_PEP517=setuptools +PYPI_VERIFY_REPO=https://github.com/cherrypy/cheroot PYTHON_COMPAT=( python3_{10..14} ) inherit distutils-r1 pypi diff --git a/dev-python/cheroot/cheroot-11.1.1.ebuild b/dev-python/cheroot/cheroot-11.1.1.ebuild new file mode 100644 index 000000000000..dec7eda59506 --- /dev/null +++ b/dev-python/cheroot/cheroot-11.1.1.ebuild @@ -0,0 +1,92 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYPI_VERIFY_REPO=https://github.com/cherrypy/cheroot +PYTHON_COMPAT=( python3_{10..14} ) + +inherit distutils-r1 pypi + +DESCRIPTION="High-performance, pure-Python HTTP server used by CherryPy" +HOMEPAGE=" + https://cherrypy.dev/ + https://pypi.org/project/cheroot/ + https://github.com/cherrypy/cheroot/ +" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="test-rust" + +RDEPEND=" + >=dev-python/more-itertools-2.6[${PYTHON_USEDEP}] + dev-python/jaraco-functools[${PYTHON_USEDEP}] +" +BDEPEND=" + >=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}] + test? ( + dev-python/jaraco-context[${PYTHON_USEDEP}] + dev-python/jaraco-text[${PYTHON_USEDEP}] + dev-python/portend[${PYTHON_USEDEP}] + dev-python/requests-toolbelt[${PYTHON_USEDEP}] + dev-python/requests-unixsocket[${PYTHON_USEDEP}] + dev-python/urllib3[${PYTHON_USEDEP}] + test-rust? ( + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/trustme[${PYTHON_USEDEP}] + ) + ) +" + +EPYTEST_PLUGINS=( pytest-{mock,rerunfailures} ) +EPYTEST_XDIST=1 +distutils_enable_tests pytest + +python_prepare_all() { + sed -e '/cov/d' \ + -e '/--numproc/d' \ + -i pytest.ini || die + + # broken + sed -i -e '/False.*localhost/d' cheroot/test/test_ssl.py || die + # pypytools is py2 stuff + sed -i -e '/pypytools/d' cheroot/test/test_server.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + local EPYTEST_DESELECT=( + # requires pypytools, see above + cheroot/test/test_server.py::test_high_number_of_file_descriptors + # known test failures with OpenSSL 3.2.0 + cheroot/test/test_ssl.py::test_https_over_http_error + # hardcoded errno codes (sigh) + # https://github.com/cherrypy/cheroot/issues/736 + cheroot/test/test_errors.py::test_plat_specific_errors + cheroot/test/test_ssl.py::test_http_over_https_error + ) + + case ${EPYTHON} in + pypy3*) + EPYTEST_DESELECT+=( + # https://github.com/cherrypy/cheroot/issues/695 + cheroot/test/test_conn.py::test_remains_alive_post_unhandled_exception + ) + ;; + esac + + local EPYTEST_IGNORE=() + if ! has_version "dev-python/pyopenssl[${PYTHON_USEDEP}]" || + ! has_version "dev-python/trustme[${PYTHON_USEDEP}]" + then + EPYTEST_IGNORE+=( + cheroot/test/test_ssl.py + ) + fi + + epytest +} diff --git a/dev-python/cheroot/files/cheroot-10.0.1-no-pytest-forked.patch b/dev-python/cheroot/files/cheroot-10.0.1-no-pytest-forked.patch deleted file mode 100644 index c9cf1d13d73c..000000000000 --- a/dev-python/cheroot/files/cheroot-10.0.1-no-pytest-forked.patch +++ /dev/null @@ -1,72 +0,0 @@ -https://github.com/cherrypy/cheroot/commit/a01ada64ae804519428d404d2fa0784392bc36ec - -From a01ada64ae804519428d404d2fa0784392bc36ec Mon Sep 17 00:00:00 2001 -From: "Jason R. Coombs" -Date: Mon, 15 Apr 2024 21:11:29 -0400 -Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20Stop=20using=20`pytest-forked`?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This plugin is incompatible with Pytest 7+, it's difficult to fix -upstream and there is no timeline for addressing that. - -The patch also bumps the top version boundary of Pytest to 7.2 due -to the pinned `pytest-cov` raising warnings. - -Fixes #502 -Resolves #511 -Closes #680 -Resolves #681 ---- - cheroot/test/test_server.py | 9 --------- - requirements/tests.in | 9 +++------ - 2 files changed, 3 insertions(+), 15 deletions(-) - -diff --git a/cheroot/test/test_server.py b/cheroot/test/test_server.py -index e2e5f788c7..3c39773119 100644 ---- a/cheroot/test/test_server.py -+++ b/cheroot/test/test_server.py -@@ -400,15 +400,6 @@ def test_reuse_port(http_server, ip_addr, mocker): - assert spy.spy_exception is None - - --ISSUE511 = IS_MACOS -- -- --if not IS_WINDOWS and not ISSUE511: -- test_high_number_of_file_descriptors = pytest.mark.forked( -- test_high_number_of_file_descriptors, -- ) -- -- - @pytest.fixture - def _garbage_bin(): - """Disable garbage collection when this fixture is in use.""" -diff --git a/requirements/tests.in b/requirements/tests.in -index 7192fdff71..9b3f4070ed 100644 ---- a/requirements/tests.in -+++ b/requirements/tests.in -@@ -34,18 +34,15 @@ pypytools - - pytest-clarity - pytest-cov==2.12.0 --pytest-forked>=1.2.0; sys_platform != "win32" - pytest-mock>=1.11.0 - pytest-rerunfailures - pytest-sugar>=0.9.3 - pytest-watch==4.2.0 - pytest-xdist>=1.28.0 - --# pytest-forked is currently incompatible with pytest 7 --# Refs: --# * https://github.com/cherrypy/cheroot/issues/511 --# * https://github.com/pytest-dev/pytest-forked/issues/67 --pytest >= 4.6.6, < 7 -+# pytest 7.2 introduces deprecations triggered by pytest-cov -+# * https://github.com/cherrypy/cheroot/issues/682 -+pytest >= 7, <7.2 - - # HTTP over UNIX socket - requests-unixsocket - -- cgit v1.3.1