From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 12:48:28 +0200 Subject: [PATCH 1/9] New package: python3-httpx-socks-0.7.8 --- srcpkgs/python3-httpx-socks/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-httpx-socks/template diff --git a/srcpkgs/python3-httpx-socks/template b/srcpkgs/python3-httpx-socks/template new file mode 100644 index 0000000000000..929180ba4f181 --- /dev/null +++ b/srcpkgs/python3-httpx-socks/template @@ -0,0 +1,18 @@ +# Template file for 'python3-httpx-socks' +pkgname=python3-httpx-socks +version=0.7.8 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel" +depends="python3-httpx python3-socks" +checkdepends="python3-aiohttp python3-anyio python3-async-timeout +python3-httpx python3-hypercorn python3-pytest python3-pytest-asyncio +python3-pytest-cov python3-pytest-trio python3-socks python3-trustme +python3-yarl" +short_desc="Proxy (HTTP, SOCKS) transports for httpx" +maintainer="Arjan Mossel " +license="Apache-2.0" +homepage="https://github.com/romis2012/httpx-socks" +distfiles="https://github.com/romis2012/httpx-socks/archive/v${version}.tar.gz" +checksum=0a4d14442e7837fd74c51b887fb4903d485d5f33ebb283c8eee7d73c664e87b5 +make_check="ci-skip" # Missing test dependencies: starlette From 90602ef2a69d4fcad46b9e83fcd703f5dcc6d11b Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 13:36:47 +0200 Subject: [PATCH 2/9] New package: python3-frozenlist-1.4.0 --- srcpkgs/python3-frozenlist/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-frozenlist/template diff --git a/srcpkgs/python3-frozenlist/template b/srcpkgs/python3-frozenlist/template new file mode 100644 index 0000000000000..8c7983a4e0180 --- /dev/null +++ b/srcpkgs/python3-frozenlist/template @@ -0,0 +1,15 @@ +# Template file for 'python3-frozenlist' +pkgname=python3-frozenlist +version=1.4.0 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools python3-wheel" +makedepends="python3-devel" +depends="python3" +checkdepends="python3-pytest python3-pytest-asyncio python3-pytest-cov" +short_desc="List-like structure which implements collections.abc.MutableSequence" +maintainer="Arjan Mossel " +license="Apache-2.0" +homepage="https://github.com/aio-libs/frozenlist" +distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz" +checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251 From c39a8c2e9e59827e1acfc7083dca07ed88777a75 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 13:38:07 +0200 Subject: [PATCH 3/9] New package: python3-aiosignal-1.3.1 --- srcpkgs/python3-aiosignal/template | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 srcpkgs/python3-aiosignal/template diff --git a/srcpkgs/python3-aiosignal/template b/srcpkgs/python3-aiosignal/template new file mode 100644 index 0000000000000..25a34eeed8cb7 --- /dev/null +++ b/srcpkgs/python3-aiosignal/template @@ -0,0 +1,15 @@ +# Template file for 'python3-aiosignal' +pkgname=python3-aiosignal +version=1.3.1 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools python3-wheel" +depends="python3-frozenlist" +checkdepends="python3-pytest python3-pytest-asyncio python3-pytest-cov + python3-frozenlist" +short_desc="List of registered asynchronous callbacks" +maintainer="Arjan Mossel " +license="Apache-2.0" +homepage="https://github.com/aio-libs/aiosignal" +distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz" +checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc From 8f5747a0c01bf18461bb886e82ed84346cf1e9c5 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 13:33:59 +0200 Subject: [PATCH 4/9] New package: python3-tiny-proxy-0.2.0 --- srcpkgs/python3-tiny-proxy/template | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 srcpkgs/python3-tiny-proxy/template diff --git a/srcpkgs/python3-tiny-proxy/template b/srcpkgs/python3-tiny-proxy/template new file mode 100644 index 0000000000000..f5050d0419f99 --- /dev/null +++ b/srcpkgs/python3-tiny-proxy/template @@ -0,0 +1,17 @@ +# Template file for 'python3-tiny-proxy' +pkgname=python3-tiny-proxy +version=0.2.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel" +depends="python3-anyio" +checkdepends="python3-aiohttp python3-aiohttp_socks python3-anyio python3-httpx + python3-httpx-socks python3-pytest python3-pytest-asyncio python3-pytest-cov + python3-trustme python3-charset-normalizer python3-aiosignal python3-certifi" +short_desc="SOCKS5/SOCKS4/HTTP proxy server" +maintainer="Arjan Mossel " +license="Apache-2.0" +homepage="https://github.com/romis2012/tiny-proxy" +distfiles="https://github.com/romis2012/tiny-proxy/archive/v${version}.tar.gz" +checksum=04080b5047ff4d3eb2fcc195be02d03d11aa96d36f770a75e84395c28fcd34f5 +make_check=no # SSLCertVerificationError From 03596cad01a79cca82ff53b1a171f1779cf55a27 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 12:22:43 +0200 Subject: [PATCH 5/9] python3-async-timeout: update to 4.0.3. --- srcpkgs/python3-async-timeout/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template index 3d07b76928a1c..717438a506364 100644 --- a/srcpkgs/python3-async-timeout/template +++ b/srcpkgs/python3-async-timeout/template @@ -1,9 +1,8 @@ # Template file for 'python3-async-timeout' pkgname=python3-async-timeout -version=3.0.1 -revision=5 +version=4.0.3 +revision=1 build_style=python3-module -pycompile_module="async_timeout" hostmakedepends="python3-setuptools" depends="python3" checkdepends="python3-pytest-asyncio" @@ -13,7 +12,7 @@ license="Apache-2.0" #changelog="https://raw.githubusercontent.com/aio-libs/async-timeout/master/CHANGES.rst" homepage="https://github.com/aio-libs/async-timeout" distfiles="https://github.com/aio-libs/async-timeout/archive/v${version}.tar.gz" -checksum=d0a7a927ed6b922835e1b014dfcaa9982caccbb25131320582cc660af7c93949 +checksum=c63f1252d5fa878fdceb7a6894f1df6a73f92546e52a0b7999a5de429fd64ff8 do_check() { # don't enable coverage From de7a5202effaceeb4137410cdf8e5dca3eab218d Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 13:35:30 +0200 Subject: [PATCH 6/9] New package: python3-re_assert-1.1.0 --- srcpkgs/python3-re_assert/template | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 srcpkgs/python3-re_assert/template diff --git a/srcpkgs/python3-re_assert/template b/srcpkgs/python3-re_assert/template new file mode 100644 index 0000000000000..f7ad859674d79 --- /dev/null +++ b/srcpkgs/python3-re_assert/template @@ -0,0 +1,18 @@ +# Template file for 'python3-re_assert' +pkgname=python3-re_assert +version=1.1.0 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel" +depends="python3-regex" +short_desc="Show where your regex match assertion failed" +maintainer="Arjan Mossel " +license="MIT" +homepage="https://github.com/asottile/re-assert" +distfiles="${PYPI_SITE}/r/re-assert/re_assert-${version}.tar.gz" +checksum=5172dfbd2047a15dff2347735dea7e495479cc7e58841199a4a4973256b20464 +make_check=no # PyPI package doesn't include tests + +post_install() { + vlicense LICENSE +} From c7e222aa16713372cd0bdf528f65b163bbe7ff0c Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 13:50:29 +0200 Subject: [PATCH 7/9] New package: python3-proxy.py-2.4.3 --- srcpkgs/python3-proxy.py/template | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 srcpkgs/python3-proxy.py/template diff --git a/srcpkgs/python3-proxy.py/template b/srcpkgs/python3-proxy.py/template new file mode 100644 index 0000000000000..d505c9222c5c0 --- /dev/null +++ b/srcpkgs/python3-proxy.py/template @@ -0,0 +1,28 @@ +# Template file for 'python3-proxy.py' +pkgname=python3-proxy.py +version=2.4.3 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools_scm python3-wheel" +depends="python3" +checkdepends="python3-httpx python3-pytest python3-pytest-cov + python3-pytest-mock python3-pytest-asyncio" +short_desc="Fast, lightweight proxy server framework" +maintainer="Arjan Mossel " +license="BSD-3-Clause" +homepage="https://github.com/abhinavsingh/proxy.py" +distfiles="${PYPI_SITE}/p/proxy.py/proxy.py-${version}.tar.gz" +checksum=6134e8f1282db1fd7fa1a4b7049e49307566851023b2ac312d9dd36e92f0c9b1 + +pre_configure() { + sed -e '/setuptools-scm-git-archive/d' -i pyproject.toml +} + +do_check() { + # Integration tests are timing out + PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not test_integration' +} + +post_install() { + vlicense LICENSE +} From cc04eca3c857d87f8d1b8f7bc713dd8e4759d23c Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 12:45:04 +0200 Subject: [PATCH 8/9] python3-aiohttp: update to 3.8.5. Switch to python3-pep517 build style Requires python3-async-timeout>=4 Depends on python3-aiosignal --- .../patches/chardet-version.patch | 30 ----------------- srcpkgs/python3-aiohttp/template | 33 +++++++++++++++---- 2 files changed, 26 insertions(+), 37 deletions(-) delete mode 100644 srcpkgs/python3-aiohttp/patches/chardet-version.patch diff --git a/srcpkgs/python3-aiohttp/patches/chardet-version.patch b/srcpkgs/python3-aiohttp/patches/chardet-version.patch deleted file mode 100644 index 91cc8ca7efb18..0000000000000 --- a/srcpkgs/python3-aiohttp/patches/chardet-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b0ed732d0a637e43c72bb1a777d02776cde37376 Mon Sep 17 00:00:00 2001 -From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> -Date: Fri, 11 Dec 2020 10:24:17 +0200 -Subject: [PATCH] Bump chardet from 3.0.4 to 4.0.0 (#5333) - -Bumps [chardet](https://github.com/chardet/chardet) from 3.0.4 to 4.0.0. -- [Release notes](https://github.com/chardet/chardet/releases) -- [Commits](https://github.com/chardet/chardet/compare/3.0.4...4.0.0) - -Signed-off-by: dependabot[bot] - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ---- - requirements/base.txt | 2 +- - setup.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git setup.py setup.py -index a9edd5d0c8..54b548c7b4 100644 ---- a/setup.py -+++ b/setup.py -@@ -66,7 +66,7 @@ - - install_requires = [ - "attrs>=17.3.0", -- "chardet>=2.0,<4.0", -+ "chardet>=2.0,<5.0", - "multidict>=4.5,<7.0", - "async_timeout>=4.0a2,<5.0", - 'asynctest==0.13.0; python_version<"3.8"', diff --git a/srcpkgs/python3-aiohttp/template b/srcpkgs/python3-aiohttp/template index 25009551d463d..1143dcf4d8d65 100644 --- a/srcpkgs/python3-aiohttp/template +++ b/srcpkgs/python3-aiohttp/template @@ -1,21 +1,40 @@ # Template file for 'python3-aiohttp' pkgname=python3-aiohttp -version=3.7.4 -revision=4 -build_style=python3-module -hostmakedepends="python3-setuptools" +version=3.8.5 +revision=1 +build_style=python3-pep517 +hostmakedepends="python3-setuptools python3-wheel" makedepends="python3-devel http-parser-devel" -depends="python3-async-timeout python3-attrs python3-chardet python3-yarl - python3-typing_extensions python3-multidict" +depends="python3-aiosignal python3-async-timeout python3-attrs + python3-chardet python3-yarl python3-typing_extensions python3-multidict" +checkdepends="$depends python3-aiosignal python3-async_generator python3-Brotli + python3-charset-normalizer python3-freezegun python3-proxy.py python3-pytest + python3-pytest-cov python3-pytest-forked python3-pytest-mock + python3-pytest-timeout python3-pytest-xdist python3-re_assert" short_desc="HTTP client/server for asyncio (PEP-3156)" maintainer="Michael Aldridge " license="Apache-2.0" homepage="https://aiohttp.readthedocs.io/" distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz" -checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de +checksum=b9552ec52cc147dbf1944ac7ac98af7602e51ea2dcd076ed194ca3c0d1c7d0bc post_patch() { # use system http-parser vsed -i '/http_parser\.c/d' -i setup.py vsed -i '/http_parser\.h/s/".*\//"/' -i aiohttp/_cparser.pxd } + +do_check() { + # Failing tests, cf. https://github.com/aio-libs/aiohttp/issues/7255 + local skiptests + skiptests+=" test_no_warnings[aiohttp._helpers] or" + skiptests+=" test_no_warnings[aiohttp._http_parser] or" + skiptests+=" test_no_warnings[aiohttp._http_writer] or" + skiptests+=" test_no_warnings[aiohttp._websocket] or" + skiptests+=" test_no_warnings[aiohttp.worker] or" + skiptests+=" test_c_parser_loaded or" + skiptests+=" test_invalid_character[pyloop] or" + skiptests+=" test_unsupported_upgrade[pyloop]" + + PYTHONPATH=$(cd build/lib* && pwd) pytest -k "not (${skiptests})" +} From 0206a11106e761671b6ea83aec1e45e64c2d0a25 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Mon, 2 Oct 2023 13:52:26 +0200 Subject: [PATCH 9/9] python3-aiohttp_socks: update to 0.8.3. Use GitHub for distfiles since PyPI package does not include tests --- srcpkgs/python3-aiohttp_socks/template | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template index 10c8125e0753e..65791b43e8c0b 100644 --- a/srcpkgs/python3-aiohttp_socks/template +++ b/srcpkgs/python3-aiohttp_socks/template @@ -1,14 +1,17 @@ # Template file for 'python3-aiohttp_socks' pkgname=python3-aiohttp_socks -version=0.8.0 +version=0.8.3 revision=1 build_style=python3-pep517 hostmakedepends="python3-setuptools python3-wheel" depends="python3-aiohttp python3-socks" -checkdepends="python3-aiohttp python3-attrs python3-socks" +checkdepends="python3-aiohttp python3-attrs python3-socks python3-pytest + python3-pytest-asyncio python3-trustme python3-Flask python3-anyio + python3-tiny-proxy python3-cchardet python3-charset-normalizer + python3-aiosignal" short_desc="SOCKS proxy connector for aiohttp" maintainer="Christian Buschau " license="Apache-2.0" homepage="https://github.com/romis2012/aiohttp-socks" -distfiles="${PYPI_SITE}/a/aiohttp_socks/aiohttp_socks-${version}.tar.gz" -checksum=927b1d3b347448f86ff5245c9ca19e40f397eb93906682be592790678c982f37 +distfiles="https://github.com/romis2012/aiohttp-socks/archive/v${version}.tar.gz" +checksum=b393a95458ad0e9c1d45fe7b9ba4a1ec959e6cd8c68fde3a61675355d4197d60