diff options
author | Michał Górny <mgorny@gentoo.org> | 2023-12-10 15:24:38 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2023-12-10 15:24:38 +0100 |
commit | 0482e646047d37536afc26291d6374b31ec03550 (patch) | |
tree | 52a9a9244554cf50573d192a727accc273464a26 /dev-python/aiohttp | |
parent | dev-ruby/activesupport: drop 7.0.7, 7.0.7.2 (diff) | |
download | gentoo-0482e646047d37536afc26291d6374b31ec03550.tar.gz gentoo-0482e646047d37536afc26291d6374b31ec03550.tar.bz2 gentoo-0482e646047d37536afc26291d6374b31ec03550.zip |
dev-python/aiohttp: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'dev-python/aiohttp')
-rw-r--r-- | dev-python/aiohttp/Manifest | 2 | ||||
-rw-r--r-- | dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild | 111 | ||||
-rw-r--r-- | dev-python/aiohttp/aiohttp-3.9.0.ebuild | 117 | ||||
-rw-r--r-- | dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch | 46 |
4 files changed, 0 insertions, 276 deletions
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest index f952f78c491e..ea185863d65a 100644 --- a/dev-python/aiohttp/Manifest +++ b/dev-python/aiohttp/Manifest @@ -1,3 +1 @@ -DIST aiohttp-3.8.6.tar.gz 7352172 BLAKE2B 4dc602abb4f9bd7c65bda7d11cde3e703bbc7786fb3f8ef36922caef42912b2c10a198ebdcecd3fcd022c3a9a729766a2023636f756a8fa10663bf988554f967 SHA512 43f1dd6670d90aefee7f0f30411b13c643ea684815b493cc4437e5f1981f4fdf4b718a40543d7c3c8c70d8b27470b8f3bf1609e46146362e0490ce0990a057f5 -DIST aiohttp-3.9.0.tar.gz 7475063 BLAKE2B 0447b9b095b3004b16eef37bd4d815f864dbfad7efb3021cb97676487cdf6d3007de47cb80daa773cc645ca60b21c79768fdc7a15163bb60578b4d05e17db924 SHA512 3001ea211985c26aa4f8a20210d80d6e72a904c1ea93a5aed5d08eb191dd253155ec5a44ae14d961c6ebbc747cbc8e602866ee7eb0b8963cf783a68dcf8b3ba6 DIST aiohttp-3.9.1.tar.gz 7482118 BLAKE2B 2150ae98f799f9c6e1f48987bfd8b1847439d8b87cd21417676c2fa5c971fcdc13c3f933dfdd5eceb92b47ad604d16c2a71d884118d8bde1816f2d944d2930a2 SHA512 3288085d5fbcfb7e3664f906345aeab6f989f2318babae6bf5cc3955de48707e9de56ce3b9553d6ee35c72b8f884dc1fd01861a638ee738573e78a203e6a9dec diff --git a/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild b/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild deleted file mode 100644 index 87cf0162f94c..000000000000 --- a/dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 multiprocessing pypi - -DESCRIPTION="HTTP client/server for asyncio" -HOMEPAGE=" - https://github.com/aio-libs/aiohttp/ - https://pypi.org/project/aiohttp/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}] - >=dev-python/attrs-17.3.0[${PYTHON_USEDEP}] - dev-python/brotlicffi[${PYTHON_USEDEP}] - <dev-python/charset-normalizer-4[${PYTHON_USEDEP}] - >=dev-python/charset-normalizer-2.0[${PYTHON_USEDEP}] - >=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}] - >=dev-python/multidict-4.5.0[${PYTHON_USEDEP}] - >=dev-python/yarl-1.0[${PYTHON_USEDEP}] -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - test? ( - dev-python/freezegun[${PYTHON_USEDEP}] - www-servers/gunicorn[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/re-assert[${PYTHON_USEDEP}] - test-rust? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) - ) -" - -DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst ) - -distutils_enable_tests pytest - -src_prepare() { - local PATCHES=( - "${FILESDIR}/${P}-brotlicffi.patch" - ) - - # increase the timeout a little - sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die - - # xfail_strict fails on py3.10 - sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die - - # which(1)... also -Werror, sigh - sed -i -e 's:which:command -v:' -e 's:-Werror::' Makefile || die - - distutils-r1_src_prepare -} - -python_configure_all() { - # workaround missing files - mkdir requirements tools || die - > requirements/cython.txt || die - > tools/gen.py || die - chmod +x tools/gen.py || die - # force rehashing first - emake requirements/.hash/cython.txt.hash - > .update-pip || die - > .install-cython || die - emake cythonize -} - -python_test() { - local EPYTEST_IGNORE=( - # proxy is not packaged - tests/test_proxy_functional.py - ) - - local EPYTEST_DESELECT=( - # Internet - tests/test_client_session.py::test_client_session_timeout_zero - # broken by irrelevant deprecation warnings - tests/test_circular_imports.py::test_no_warnings - # TODO - tests/test_client_session.py::test_request_tracing_url_params - ) - - case ${EPYTHON} in - pypy3) - # upstream unconditionally blocks building C extensions - # on PyPy3 but the test suite needs an explicit switch, - # sigh - local -x AIOHTTP_NO_EXTENSIONS=1 - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked - rm -rf aiohttp || die - epytest -n "$(makeopts_jobs)" --forked -} diff --git a/dev-python/aiohttp/aiohttp-3.9.0.ebuild b/dev-python/aiohttp/aiohttp-3.9.0.ebuild deleted file mode 100644 index 43338cff0e79..000000000000 --- a/dev-python/aiohttp/aiohttp-3.9.0.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..12} pypy3 ) - -inherit distutils-r1 pypi - -DESCRIPTION="HTTP client/server for asyncio" -HOMEPAGE=" - https://github.com/aio-libs/aiohttp/ - https://pypi.org/project/aiohttp/ -" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="test-rust" - -RDEPEND=" - >=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}] - >=dev-python/attrs-17.3.0[${PYTHON_USEDEP}] - dev-python/brotlicffi[${PYTHON_USEDEP}] - >=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}] - >=dev-python/multidict-4.5.0[${PYTHON_USEDEP}] - >=dev-python/yarl-1.0[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - <dev-python/async-timeout-5[${PYTHON_USEDEP}] - >=dev-python/async-timeout-4.0[${PYTHON_USEDEP}] - ' 3.10) -" -BDEPEND=" - dev-python/cython[${PYTHON_USEDEP}] - test? ( - dev-python/freezegun[${PYTHON_USEDEP}] - www-servers/gunicorn[${PYTHON_USEDEP}] - dev-python/pytest-forked[${PYTHON_USEDEP}] - dev-python/pytest-mock[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - dev-python/re-assert[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/time-machine[${PYTHON_USEDEP}] - ' 'python3*') - test-rust? ( - dev-python/trustme[${PYTHON_USEDEP}] - ) - ) -" - -DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst ) - -EPYTEST_XDIST=1 -distutils_enable_tests pytest - -src_prepare() { - # increase the timeout a little - sed -e '/abs=/s/0.001/0.01/' -i tests/test_helpers.py || die - # xfail_strict fails on py3.10 - sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die - sed -i -e 's:-Werror::' Makefile || die - - distutils-r1_src_prepare -} - -python_configure_all() { - # workaround missing files - mkdir requirements tools || die - > requirements/cython.txt || die - > tools/gen.py || die - chmod +x tools/gen.py || die - # force rehashing first - emake requirements/.hash/cython.txt.hash - > .update-pip || die - > .install-cython || die - emake cythonize -} - -python_test() { - local EPYTEST_IGNORE=( - # proxy is not packaged - tests/test_proxy_functional.py - # python_on_whales is not packaged - tests/autobahn/test_autobahn.py - ) - - local EPYTEST_DESELECT=( - # Internet - tests/test_client_session.py::test_client_session_timeout_zero - # broken by irrelevant deprecation warnings - tests/test_circular_imports.py::test_no_warnings - # TODO - tests/test_client_session.py::test_request_tracing_url_params - # fragile timing test - tests/test_imports.py::test_import_time - # crash in time-machine - # https://github.com/aio-libs/aiohttp/issues/7851 - # https://github.com/adamchainz/time-machine/issues/403 - tests/test_cookiejar.py::TestCookieJarSafe::test_max_age - ) - - case ${EPYTHON} in - pypy3) - # upstream unconditionally blocks building C extensions - # on PyPy3 but the test suite needs an explicit switch, - # sigh - local -x AIOHTTP_NO_EXTENSIONS=1 - ;; - esac - - local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 - local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked - rm -rf aiohttp || die - epytest --forked -} diff --git a/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch b/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch deleted file mode 100644 index 20e3c7ea0e5d..000000000000 --- a/dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4d60891531637aed2fdc50a5dff4809d7d9b3f32 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Wed, 20 Sep 2023 15:28:37 +0200 -Subject: [PATCH] [3.9] Support brotlicffi alternatively to brotli (#7611) - (#7620) - ---- - aiohttp/http_parser.py | 5 ++++- - tests/test_http_parser.py | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/aiohttp/http_parser.py b/aiohttp/http_parser.py -index 91e01f43..521ff5db 100644 ---- a/aiohttp/http_parser.py -+++ b/aiohttp/http_parser.py -@@ -49,7 +49,10 @@ else: - from typing_extensions import Literal - - try: -- import brotli -+ try: -+ import brotlicffi as brotli -+ except ImportError: -+ import brotli - - HAS_BROTLI = True - except ImportError: # pragma: no cover -diff --git a/tests/test_http_parser.py b/tests/test_http_parser.py -index 4b185c9e..dc373ea8 100644 ---- a/tests/test_http_parser.py -+++ b/tests/test_http_parser.py -@@ -21,7 +21,10 @@ from aiohttp.http_parser import ( - ) - - try: -- import brotli -+ try: -+ import brotlicffi as brotli -+ except ImportError: -+ import brotli - except ImportError: - brotli = None - --- -2.42.0 - |