mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/aiohttp: Backport brotlicffi support
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
111
dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
Normal file
111
dev-python/aiohttp/aiohttp-3.8.6-r1.ebuild
Normal file
@@ -0,0 +1,111 @@
|
||||
# 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
|
||||
}
|
||||
46
dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
Normal file
46
dev-python/aiohttp/files/aiohttp-3.8.6-brotlicffi.patch
Normal file
@@ -0,0 +1,46 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user