commit: 82ac45b474e39d598836d0427d3177dbd63d141f Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Mar 8 16:15:44 2025 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Mar 8 16:22:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82ac45b4
dev-python/h2: Remove old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> dev-python/h2/Manifest | 1 - .../h2/files/h2-4.1.0-python3.11-tests.patch | 104 --------------------- dev-python/h2/h2-4.1.0-r1.ebuild | 38 -------- 3 files changed, 143 deletions(-) diff --git a/dev-python/h2/Manifest b/dev-python/h2/Manifest index 905e97e5cb3f..e9ab86a6d81b 100644 --- a/dev-python/h2/Manifest +++ b/dev-python/h2/Manifest @@ -1,2 +1 @@ -DIST h2-4.1.0.tar.gz 2145593 BLAKE2B d4494ee58b97c3fb28f3480df3ecee9d8a0b6eec7165c692a6d33664eaf4e7a78a3e97f6644ba75a6bc1b67dfc3b6d0e431b90c6fe70ce4d4f3e22259419ace7 SHA512 89553cf1343de14b681706ac254b7e714574c777c6c81c934a00edc4f8fdde26f78fb90b4aebd9feec7893f4d1b68cf30dc9a404dd048cedbbfab3145720edc5 DIST h2-4.2.0.tar.gz 2150682 BLAKE2B aee7821baf722dd9765c5a8ec22b33fa50b50183660212a4fe981d8e02b7afdad6b21166d3ad8656d336f9553c33c0ee8b4fd9a8d9cf370ff95d82f5333ea63d SHA512 a88a06ad7511cbc3870e8477aa3a4f1ab79c9db0ab1e71578c6e5be1bbc22d2d0a7b6878a8c18bd8b2cb22f1df9e46fe3e3c7223f44fa01f8d25f5f5bad28983 diff --git a/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch b/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch deleted file mode 100644 index c444e6a5007a..000000000000 --- a/dev-python/h2/files/h2-4.1.0-python3.11-tests.patch +++ /dev/null @@ -1,104 +0,0 @@ -https://github.com/python-hyper/h2/commit/eabe727282e7a7aa3254773292f86cf341bdc597 - -From eabe727282e7a7aa3254773292f86cf341bdc597 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <[email protected]> -Date: Sun, 3 Jul 2022 12:05:05 +0200 -Subject: [PATCH] Fix repr() checks for Python 3.11 - -In Python 3.11, repr() was modified, this commit fixes the -assertions to match the new repr() behavior. - -Fix #1268 ---- a/test/test_events.py -+++ b/test/test_events.py -@@ -207,11 +207,18 @@ def test_remotesettingschanged_repr(self): - ), - } - -- assert repr(e) == ( -- "<RemoteSettingsChanged changed_settings:{ChangedSetting(" -- "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " -- "new_value=32768)}>" -- ) -+ if sys.version_info >= (3, 11): -+ assert repr(e) == ( -+ "<RemoteSettingsChanged changed_settings:{ChangedSetting(" -+ "setting=4, original_value=65536, " -+ "new_value=32768)}>" -+ ) -+ else: -+ assert repr(e) == ( -+ "<RemoteSettingsChanged changed_settings:{ChangedSetting(" -+ "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " -+ "new_value=32768)}>" -+ ) - - def test_pingreceived_repr(self): - """ -@@ -249,10 +256,16 @@ def test_streamreset_repr(self): - e.error_code = h2.errors.ErrorCodes.ENHANCE_YOUR_CALM - e.remote_reset = False - -- assert repr(e) == ( -- "<StreamReset stream_id:919, " -- "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>" -- ) -+ if sys.version_info >= (3, 11): -+ assert repr(e) == ( -+ "<StreamReset stream_id:919, " -+ "error_code:11, remote_reset:False>" -+ ) -+ else: -+ assert repr(e) == ( -+ "<StreamReset stream_id:919, " -+ "error_code:ErrorCodes.ENHANCE_YOUR_CALM, remote_reset:False>" -+ ) - - def test_pushedstreamreceived_repr(self): - """ -@@ -284,11 +297,18 @@ def test_settingsacknowledged_repr(self): - ), - } - -- assert repr(e) == ( -- "<SettingsAcknowledged changed_settings:{ChangedSetting(" -- "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " -- "new_value=32768)}>" -- ) -+ if sys.version_info >= (3, 11): -+ assert repr(e) == ( -+ "<SettingsAcknowledged changed_settings:{ChangedSetting(" -+ "setting=4, original_value=65536, " -+ "new_value=32768)}>" -+ ) -+ else: -+ assert repr(e) == ( -+ "<SettingsAcknowledged changed_settings:{ChangedSetting(" -+ "setting=SettingCodes.INITIAL_WINDOW_SIZE, original_value=65536, " -+ "new_value=32768)}>" -+ ) - - def test_priorityupdated_repr(self): - """ -@@ -318,10 +338,16 @@ def test_connectionterminated_repr(self, additional_data, data_repr): - e.last_stream_id = 33 - e.additional_data = additional_data - -- assert repr(e) == ( -- "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, " -- "last_stream_id:33, additional_data:%s>" % data_repr -- ) -+ if sys.version_info >= (3, 11): -+ assert repr(e) == ( -+ "<ConnectionTerminated error_code:12, " -+ "last_stream_id:33, additional_data:%s>" % data_repr -+ ) -+ else: -+ assert repr(e) == ( -+ "<ConnectionTerminated error_code:ErrorCodes.INADEQUATE_SECURITY, " -+ "last_stream_id:33, additional_data:%s>" % data_repr -+ ) - - def test_alternativeserviceavailable_repr(self): - """ - diff --git a/dev-python/h2/h2-4.1.0-r1.ebuild b/dev-python/h2/h2-4.1.0-r1.ebuild deleted file mode 100644 index 46b99db75231..000000000000 --- a/dev-python/h2/h2-4.1.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="HTTP/2 State-Machine based protocol implementation" -HOMEPAGE=" - https://python-hyper.org/projects/h2/en/stable/ - https://github.com/python-hyper/h2/ - https://pypi.org/project/h2/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -RDEPEND=" - >=dev-python/hyperframe-6.0[${PYTHON_USEDEP}] - <dev-python/hyperframe-7[${PYTHON_USEDEP}] - >=dev-python/hpack-4.0[${PYTHON_USEDEP}] - <dev-python/hpack-5[${PYTHON_USEDEP}] -" -BDEPEND=" - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - "${FILESDIR}"/${P}-python3.11-tests.patch -) - -distutils_enable_tests pytest
