forked from pool/python-aiohttp
Accepting request 1311812 from devel:languages:python
- Add fix-vendoring.patch - Update to 3.13.0 Details: https://github.com/aio-libs/aiohttp/releases/tag/v3.13.0 * python 3.14 support * zstd support - drop remove-isal-test-dep.patch - "make cythonize" is required as poetry is not supporting cython - add vendor-llhttp.tar.gz of new git submodule. added downloaded nodejs modules OBS-URL: https://build.opensuse.org/request/show/1311812 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-aiohttp?expand=0&rev=60
This commit is contained in:
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4fc61385e9c98d72fcdf47e6dd81833f47b2f77c114c29cd64a361be57a763a2
|
||||
size 7823716
|
||||
3
aiohttp-3.13.0.tar.gz
Normal file
3
aiohttp-3.13.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7a3398198d60c14ec060868ae6c1ede55833b67af728733d76944293a5b6e071
|
||||
size 1101225
|
||||
75
fix-vendoring.patch
Normal file
75
fix-vendoring.patch
Normal file
@@ -0,0 +1,75 @@
|
||||
--- a/Makefile.orig 2025-10-16 13:56:38.297077787 +0200
|
||||
+++ b/Makefile 2025-10-16 13:59:43.532929894 +0200
|
||||
@@ -47,10 +47,8 @@
|
||||
.SECONDARY: $(call to-hash,$(ALLS))
|
||||
|
||||
.update-pip:
|
||||
- @python -m pip install --upgrade pip
|
||||
|
||||
.install-cython: .update-pip $(call to-hash,requirements/cython.txt)
|
||||
- @python -m pip install -r requirements/cython.in -c requirements/cython.txt
|
||||
@touch .install-cython
|
||||
|
||||
aiohttp/_find_header.c: $(call to-hash,aiohttp/hdrs.py ./tools/gen.py)
|
||||
@@ -85,7 +83,6 @@
|
||||
cythonize-nodeps: $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c
|
||||
|
||||
.install-deps: .install-cython $(PYXS:.pyx=.c) aiohttp/_websocket/reader_c.c $(call to-hash,$(CYS) $(REQS))
|
||||
- @python -m pip install -r requirements/dev.in -c requirements/dev.txt
|
||||
@touch .install-deps
|
||||
|
||||
.PHONY: lint
|
||||
@@ -100,7 +97,6 @@
|
||||
mypy
|
||||
|
||||
.develop: .install-deps generate-llhttp $(call to-hash,$(PYS) $(CYS) $(CS))
|
||||
- python -m pip install -e . -c requirements/runtime-deps.txt
|
||||
@touch .develop
|
||||
|
||||
.PHONY: test
|
||||
@@ -110,12 +106,12 @@
|
||||
.PHONY: vtest
|
||||
vtest: .develop
|
||||
@pytest -s -v
|
||||
- @python -X dev -m pytest -s -v -m dev_mode
|
||||
+ python3 -X dev -m pytest -s -v -m dev_mode
|
||||
|
||||
.PHONY: vvtest
|
||||
vvtest: .develop
|
||||
@pytest -vv
|
||||
- @python -X dev -m pytest -s -v -m dev_mode
|
||||
+ python3 -X dev -m pytest -s -v -m dev_mode
|
||||
|
||||
|
||||
define run_tests_in_docker
|
||||
@@ -151,7 +147,7 @@
|
||||
@rm -rf build
|
||||
@rm -rf cover
|
||||
@make -C docs clean
|
||||
- @python setup.py clean
|
||||
+ python3 setup.py clean
|
||||
@rm -f aiohttp/*.so
|
||||
@rm -f aiohttp/*.pyd
|
||||
@rm -f aiohttp/*.html
|
||||
@@ -182,7 +178,6 @@
|
||||
|
||||
.PHONY: install
|
||||
install: .update-pip
|
||||
- @python -m pip install -r requirements/dev.in -c requirements/dev.txt
|
||||
|
||||
.PHONY: install-dev
|
||||
install-dev: .develop
|
||||
@@ -190,4 +185,4 @@
|
||||
.PHONY: sync-direct-runtime-deps
|
||||
sync-direct-runtime-deps:
|
||||
@echo Updating 'requirements/runtime-deps.in' from 'setup.cfg'... >&2
|
||||
- @python requirements/sync-direct-runtime-deps.py
|
||||
+ python3 requirements/sync-direct-runtime-deps.py
|
||||
--- a/tools/gen.py.orig 2025-10-16 14:00:10.257485651 +0200
|
||||
+++ a/tools/gen.py 2025-10-16 14:00:18.604659234 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python3
|
||||
|
||||
import io
|
||||
import pathlib
|
||||
@@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 16 21:40:07 UTC 2025 - Matej Cepl <mcepl@cepl.eu>
|
||||
|
||||
- Add fix-vendoring.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 16 14:06:37 UTC 2025 - Adrian Schröter <adrian@suse.de>
|
||||
|
||||
- Update to 3.13.0
|
||||
Details: https://github.com/aio-libs/aiohttp/releases/tag/v3.13.0
|
||||
* python 3.14 support
|
||||
* zstd support
|
||||
- drop remove-isal-test-dep.patch
|
||||
- "make cythonize" is required as poetry is not supporting cython
|
||||
- add vendor-llhttp.tar.gz of new git submodule.
|
||||
added downloaded nodejs modules
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 7 11:36:47 UTC 2025 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-aiohttp
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@@ -19,18 +19,22 @@
|
||||
%bcond_with docs
|
||||
%{?sle15_python_module_pythons}
|
||||
Name: python-aiohttp
|
||||
Version: 3.12.15
|
||||
Version: 3.13.0
|
||||
Release: 0
|
||||
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
|
||||
# llhttp vendor tar ball manually created based on git submodule via:
|
||||
# - yarn
|
||||
# - make generate
|
||||
# - tar cfvz vendor-llhttp.tar.gz vendor/
|
||||
Source2: vendor-llhttp.tar.gz
|
||||
Patch0: test_no_warnings_fix.patch
|
||||
# PATCH-FIX-OPENSUSE remove-isal-test-dep.patch -- daniel.garcia@suse.com
|
||||
# Remove python-isal dependency for testing.
|
||||
Patch1: remove-isal-test-dep.patch
|
||||
# PATCH-FIX-OPENSUSE remove-zlib-ng-test-dep.patch
|
||||
Patch2: remove-zlib-ng-test-dep.patch
|
||||
# PATCH-FIX-OPENSUSE fix-vendoring.patch
|
||||
Patch3: fix-vendoring.patch
|
||||
Requires: python-aiohappyeyeballs >= 2.5.0
|
||||
Requires: python-aiosignal >= 1.4
|
||||
Requires: python-attrs >= 17.3.0
|
||||
@@ -109,6 +113,11 @@ HTML documentation on the API and examples for %{name}.
|
||||
# don't check coverage
|
||||
sed -i '/--cov/d' setup.cfg
|
||||
|
||||
# vendored llhttp
|
||||
tar xfv %{S:2}
|
||||
# prepare cython files manually for now
|
||||
make cythonize
|
||||
|
||||
%build
|
||||
export CFLAGS="%{optflags}"
|
||||
%pyproject_wheel
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
Index: aiohttp-3.12.13/tests/conftest.py
|
||||
===================================================================
|
||||
--- aiohttp-3.12.13.orig/tests/conftest.py
|
||||
+++ aiohttp-3.12.13/tests/conftest.py
|
||||
@@ -12,7 +12,6 @@ from typing import Any, AsyncIterator, G
|
||||
from unittest import mock
|
||||
from uuid import uuid4
|
||||
|
||||
-import isal.isal_zlib
|
||||
import pytest
|
||||
import zlib_ng.zlib_ng
|
||||
from blockbuster import blockbuster_ctx
|
||||
@@ -331,7 +330,7 @@ def unused_port_socket() -> Generator[so
|
||||
s.close()
|
||||
|
||||
|
||||
-@pytest.fixture(params=[zlib, zlib_ng.zlib_ng, isal.isal_zlib])
|
||||
+@pytest.fixture(params=[zlib, zlib_ng.zlib_ng])
|
||||
def parametrize_zlib_backend(
|
||||
request: pytest.FixtureRequest,
|
||||
) -> Generator[None, None, None]:
|
||||
@@ -1,30 +1,11 @@
|
||||
Index: aiohttp-3.12.14/requirements/test.in
|
||||
===================================================================
|
||||
--- aiohttp-3.12.14.orig/requirements/test.in
|
||||
+++ aiohttp-3.12.14/requirements/test.in
|
||||
@@ -17,4 +17,3 @@ re-assert
|
||||
setuptools-git
|
||||
trustme; platform_machine != "i686" # no 32-bit wheels
|
||||
wait-for-it
|
||||
-zlib_ng
|
||||
Index: aiohttp-3.12.14/tests/conftest.py
|
||||
===================================================================
|
||||
--- aiohttp-3.12.14.orig/tests/conftest.py
|
||||
+++ aiohttp-3.12.14/tests/conftest.py
|
||||
@@ -13,7 +13,6 @@ from unittest import mock
|
||||
from uuid import uuid4
|
||||
|
||||
import pytest
|
||||
-import zlib_ng.zlib_ng
|
||||
from blockbuster import blockbuster_ctx
|
||||
|
||||
from aiohttp import payload
|
||||
@@ -330,7 +329,7 @@ def unused_port_socket() -> Generator[so
|
||||
--- a/tests/conftest.py.orig 2025-10-16 16:10:22.546232519 +0200
|
||||
+++ a/tests/conftest.py 2025-10-16 16:10:30.949427637 +0200
|
||||
@@ -336,7 +336,7 @@
|
||||
s.close()
|
||||
|
||||
|
||||
-@pytest.fixture(params=[zlib, zlib_ng.zlib_ng])
|
||||
+@pytest.fixture(params=[zlib])
|
||||
-@pytest.fixture(params=["zlib", "zlib_ng.zlib_ng", "isal.isal_zlib"])
|
||||
+@pytest.fixture(params=["zlib"])
|
||||
def parametrize_zlib_backend(
|
||||
request: pytest.FixtureRequest,
|
||||
) -> Generator[None, None, None]:
|
||||
|
||||
3
vendor-llhttp.tar.gz
Normal file
3
vendor-llhttp.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ea2acbf9b6a1e3eef3a0179f9d2c466e77f6b1a42fd4b7d984922177c09cc2b1
|
||||
size 27866937
|
||||
Reference in New Issue
Block a user