diff --git a/aiohttp-pr7057-bump-charset-normalizer.patch b/aiohttp-pr7057-bump-charset-normalizer.patch new file mode 100644 index 0000000..fd95c86 --- /dev/null +++ b/aiohttp-pr7057-bump-charset-normalizer.patch @@ -0,0 +1,22 @@ +From b619273de1bbb75e07668b4d3a59a8907e4b37cf Mon Sep 17 00:00:00 2001 +From: Sam Bull +Date: Fri, 28 Oct 2022 21:25:52 +0100 +Subject: [PATCH] Raise allowed charset version + +--- + setup.cfg | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: aiohttp-3.8.3/setup.cfg +=================================================================== +--- aiohttp-3.8.3.orig/setup.cfg ++++ aiohttp-3.8.3/setup.cfg +@@ -47,7 +47,7 @@ zip_safe = False + include_package_data = True + install_requires = + attrs >= 17.3.0 +- charset-normalizer >=2.0, < 3.0 ++ charset-normalizer >=2.0, < 4.0 + multidict >=4.5, < 7.0 + async_timeout >= 4.0.0a3, < 5.0 + asynctest == 0.13.0; python_version<"3.8" diff --git a/ignore-pytest-deprecationwarning.patch b/ignore-pytest-deprecationwarning.patch deleted file mode 100644 index 749ef8d..0000000 --- a/ignore-pytest-deprecationwarning.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: aiohttp-3.8.3/setup.cfg -=================================================================== ---- aiohttp-3.8.3.orig/setup.cfg -+++ aiohttp-3.8.3/setup.cfg -@@ -125,6 +125,7 @@ filterwarnings = - ignore:Creating a LegacyVersion has been deprecated and will be removed in the next major release:DeprecationWarning:: - ignore:module 'sre_constants' is deprecated:DeprecationWarning:pkg_resources._vendor.pyparsing - ignore:path is deprecated. Use files.. instead. Refer to https.//importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy for migration advice.:DeprecationWarning:certifi.core -+ ignore:Passing None has been deprecated:pytest.PytestDeprecationWarning - junit_suite_name = aiohttp_test_suite - norecursedirs = dist docs build .tox .eggs - minversion = 3.8.2 diff --git a/python-aiohttp.changes b/python-aiohttp.changes index 16e368d..a25db23 100644 --- a/python-aiohttp.changes +++ b/python-aiohttp.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Nov 7 17:49:50 UTC 2022 - Ben Greiner + +- Drop ignore-pytest-deprecationwarning.patch +- Add aiohttp-pr7057-bump-charset-normalizer.patch + * gh#aio-libs/aiohttp#7057 + * Sync requirement with rpm specs + ------------------------------------------------------------------- Tue Oct 4 20:31:56 UTC 2022 - Dirk Müller diff --git a/python-aiohttp.spec b/python-aiohttp.spec index 268a547..3226994 100644 --- a/python-aiohttp.spec +++ b/python-aiohttp.spec @@ -16,7 +16,6 @@ # -%{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 # requires some unavailable modules %bcond_with docs @@ -27,42 +26,46 @@ Summary: Asynchronous HTTP client/server framework License: Apache-2.0 URL: https://github.com/aio-libs/aiohttp Source: https://files.pythonhosted.org/packages/source/a/aiohttp/aiohttp-%{version}.tar.gz -# PATCH-FIX-OPENSUSE ignore-pytest-deprecationwarning.patch -- gh#aio-libs/aiohttp#6663 -Patch0: ignore-pytest-deprecationwarning.patch +# PATCH-FIX-UPSTREAM aiohttp-pr7057-bump-charset-normalizer.patch gh#aio-libs/aiohttp#7057 +Patch0: aiohttp-pr7057-bump-charset-normalizer.patch +# SECTION build requirements BuildRequires: %{python_module Cython} -BuildRequires: %{python_module aiosignal >= 1.1.2} -BuildRequires: %{python_module async_timeout >= 4.0} -BuildRequires: %{python_module asynctest = 0.13.0 if %python-base < 3.8} -BuildRequires: %{python_module attrs >= 17.3.0} -BuildRequires: %{python_module charset-normalizer >= 2.0} BuildRequires: %{python_module devel >= 3.6} -BuildRequires: %{python_module frozenlist >= 1.1.1} -BuildRequires: %{python_module idna_ssl >= 1.0 if %python-base < 3.7} -BuildRequires: %{python_module multidict >= 4.5} +BuildRequires: %{python_module pip} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module typing_extensions >= 3.7.4 if %python-base < 3.8} -BuildRequires: %{python_module yarl >= 1.0} +BuildRequires: %{python_module wheel} BuildRequires: fdupes BuildRequires: http-parser-devel BuildRequires: python-rpm-macros -Requires: python >= 3.6 +# /SECTION +# SECTION install requirements +BuildRequires: %{python_module aiosignal >= 1.1.2} +BuildRequires: %{python_module async_timeout >= 4.0 with %python-async_timeout < 5} +BuildRequires: %{python_module asynctest = 0.13.0 if %python-base < 3.8} +BuildRequires: %{python_module attrs >= 17.3.0} +BuildRequires: %{python_module charset-normalizer >= 2.0 with %python-charset-normalizer < 4} +BuildRequires: %{python_module frozenlist >= 1.1.1} +BuildRequires: %{python_module idna_ssl >= 1.0 if %python-base < 3.7} +BuildRequires: %{python_module multidict >= 4.5 with %python-multidict < 7} +BuildRequires: %{python_module typing_extensions >= 3.7.4 if %python-base < 3.8} +BuildRequires: %{python_module yarl >= 1.0 with %python-yarl < 2} +# /SECTION Requires: python-aiosignal >= 1.1.2 -Requires: python-async_timeout >= 4.0 Requires: python-attrs >= 17.3.0 -Requires: python-charset-normalizer >= 2.0 Requires: python-frozenlist >= 1.1.1 -Requires: python-multidict >= 4.5 -Requires: python-yarl >= 1.0 +Requires: (python-async_timeout >= 4.0 with python-async_timeout < 5) Requires: (python-asynctest = 0.13.0 if python-base < 3.8) +Requires: (python-charset-normalizer >= 2.0 with python-charset-normalizer < 4) Requires: (python-idna_ssl >= 1.0 if python-base < 3.7) +Requires: (python-multidict >= 4.5 with python-multidict < 7) Requires: (python-typing_extensions >= 3.7.4 if python-base < 3.8) +Requires: (python-yarl >= 1.0 with python-yarl < 2) Recommends: python-aiodns Recommends: python-brotlipy Recommends: python-cChardet Suggests: %{name}-doc # SECTION test requirements BuildRequires: %{python_module aiodns} -BuildRequires: %{python_module async_generator} BuildRequires: %{python_module brotlipy} BuildRequires: %{python_module freezegun} BuildRequires: %{python_module gunicorn} @@ -109,7 +112,7 @@ sed -i '/--cov/d' setup.cfg %build export CFLAGS="%{optflags}" -%python_build +%pyproject_wheel %if %{with docs} pushd docs %make_build html @@ -118,7 +121,7 @@ popd %endif %install -%python_install +%pyproject_install %{python_expand %fdupes %{buildroot}%{$python_sitearch} find %{buildroot}%{$python_sitearch} -name '*.[ch]' -delete rm -r %{buildroot}%{$python_sitearch}/aiohttp/.hash