* [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
@ 2023-10-02 13:48 ar-jan
2023-10-02 13:54 ` [PR PATCH] [Updated] " ar-jan
` (26 more replies)
0 siblings, 27 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 13:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1467 bytes --]
There is a new pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 14933 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 0a4bb115cbcd6b3e015a85815753d62a17bd9e17 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template
index 3d07b76928a1c..ba0ba1cefe8f2 100644
--- a/srcpkgs/python3-async-timeout/template
+++ b/srcpkgs/python3-async-timeout/template
@@ -1,7 +1,7 @@
# 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"
@@ -13,7 +13,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 02b670ce8e2a33cc31b7eead8dd4370b9fdf440c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 6/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] <support@github.com>
-
-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..e209f6aa4dfdb 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>=4.0.3 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 <maldridge@voidlinux.org>"
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 398fea830035192e1c8eb217b4ff582525ca8883 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:35:30 +0200
Subject: [PATCH 7/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 <arjanmossel@gmail.com>"
+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 eab6d3117de835e3e8256286e54b6c5e499aa8e7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:50:29 +0200
Subject: [PATCH 8/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 <arjanmossel@gmail.com>"
+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 8088350f35f4910012fa114c3f66c430f5bd0a1c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
@ 2023-10-02 13:54 ` ar-jan
2023-10-02 13:57 ` ar-jan
` (25 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 13:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 14926 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 0a4bb115cbcd6b3e015a85815753d62a17bd9e17 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-async-timeout/template b/srcpkgs/python3-async-timeout/template
index 3d07b76928a1c..ba0ba1cefe8f2 100644
--- a/srcpkgs/python3-async-timeout/template
+++ b/srcpkgs/python3-async-timeout/template
@@ -1,7 +1,7 @@
# 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"
@@ -13,7 +13,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 cb41768e65d462de34cfbccf333a7a7b7ef9e536 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 448ff49bd5c84d80702d7befd66e78493f911493 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 88d7016c7eed4ea4b6ff199cddcf5faf2c0f12cf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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] <support@github.com>
-
-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 <maldridge@voidlinux.org>"
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 0925822bca391e84c0cff74627e9f29f769b0807 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
2023-10-02 13:54 ` [PR PATCH] [Updated] " ar-jan
@ 2023-10-02 13:57 ` ar-jan
2023-10-02 14:17 ` ar-jan
` (24 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 13:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 14985 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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] <support@github.com>
-
-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 <maldridge@voidlinux.org>"
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 <arjanmossel@gmail.com>
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 <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
2023-10-02 13:54 ` [PR PATCH] [Updated] " ar-jan
2023-10-02 13:57 ` ar-jan
@ 2023-10-02 14:17 ` ar-jan
2023-10-02 14:30 ` [PR PATCH] [Updated] " ar-jan
` (23 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 201 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1743105407
Comment:
Hmm, all tests pass locally. Some missing dependency for CI?
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (2 preceding siblings ...)
2023-10-02 14:17 ` ar-jan
@ 2023-10-02 14:30 ` ar-jan
2023-10-02 14:46 ` ar-jan
` (22 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 14:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 14976 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 dabfa8fad9fc8fe8701fe1f69640de1b458bc69a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..f388bc650adb1
--- /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 iana-etc"
+short_desc="Fast, lightweight proxy server framework"
+maintainer="Arjan Mossel <arjanmossel@gmail.com>"
+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 51bc22fd9eb56f70ecb2420b61523ce9e8532bb5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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] <support@github.com>
-
-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..35fbb2713c1d2 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-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 <maldridge@voidlinux.org>"
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 e35328969c5a743fb510a5f57affbbdbf8af4edc Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (3 preceding siblings ...)
2023-10-02 14:30 ` [PR PATCH] [Updated] " ar-jan
@ 2023-10-02 14:46 ` ar-jan
2023-10-02 15:03 ` ar-jan
` (21 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 15140 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 90cbcef0a914aac2313126b4b1de96d21e2a77e2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 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..af08e13e36f0a
--- /dev/null
+++ b/srcpkgs/python3-proxy.py/template
@@ -0,0 +1,29 @@
+# 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 <arjanmossel@gmail.com>"
+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; and test_wait_for_server_raises_timeout_error
+ # errors on CI with "OSError: [Errno 99] Cannot assign requested address"
+ PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not (test_integration or test_wait_for_server_raises_timeout_error)'
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 80a1e6ecb71c02846b80a299c7293d371e638c5c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 34 ++++++++++++++-----
2 files changed, 26 insertions(+), 38 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] <support@github.com>
-
-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..0e6ade6317047 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,39 @@
# 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-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 <maldridge@voidlinux.org>"
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 85b1cdc1a41972cfa7c1c1fcfec6ce393c0708ca Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (4 preceding siblings ...)
2023-10-02 14:46 ` ar-jan
@ 2023-10-02 15:03 ` ar-jan
2023-10-02 15:38 ` ar-jan
` (20 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 15118 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From c99ecf40a7f09e255e57b99f352b084d3c472d8f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..fd60ed208d61a
--- /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-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 <arjanmossel@gmail.com>"
+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 09f67843fec61b066be587e7358034e202e1f3fe Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 3d5df79b3547533686f6ae5387ac48a79228220b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 0deb791b429dda8556a6b8b9b1db52d43964c73b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 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..af08e13e36f0a
--- /dev/null
+++ b/srcpkgs/python3-proxy.py/template
@@ -0,0 +1,29 @@
+# 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 <arjanmossel@gmail.com>"
+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; and test_wait_for_server_raises_timeout_error
+ # errors on CI with "OSError: [Errno 99] Cannot assign requested address"
+ PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not (test_integration or test_wait_for_server_raises_timeout_error)'
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 94bd7194d3b88eb2bd245152ae459482ed189cf7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 34 ++++++++++++++-----
2 files changed, 26 insertions(+), 38 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] <support@github.com>
-
-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..0e6ade6317047 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,39 @@
# 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-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 <maldridge@voidlinux.org>"
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 fb99d320cd8fbdaf6b88c0a79b231b448c58a667 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (5 preceding siblings ...)
2023-10-02 15:03 ` ar-jan
@ 2023-10-02 15:38 ` ar-jan
2023-10-03 8:43 ` ar-jan
` (19 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-02 15:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 15127 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From c99ecf40a7f09e255e57b99f352b084d3c472d8f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..fd60ed208d61a
--- /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-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 <arjanmossel@gmail.com>"
+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 09f67843fec61b066be587e7358034e202e1f3fe Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 3d5df79b3547533686f6ae5387ac48a79228220b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 0deb791b429dda8556a6b8b9b1db52d43964c73b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 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..af08e13e36f0a
--- /dev/null
+++ b/srcpkgs/python3-proxy.py/template
@@ -0,0 +1,29 @@
+# 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 <arjanmossel@gmail.com>"
+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; and test_wait_for_server_raises_timeout_error
+ # errors on CI with "OSError: [Errno 99] Cannot assign requested address"
+ PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not (test_integration or test_wait_for_server_raises_timeout_error)'
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 94bd7194d3b88eb2bd245152ae459482ed189cf7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 34 ++++++++++++++-----
2 files changed, 26 insertions(+), 38 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] <support@github.com>
-
-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..0e6ade6317047 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,39 @@
# 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-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 <maldridge@voidlinux.org>"
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 72953914cc6e73ca0716e262c09e6ee611bafcd7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..a9e2164858e0e 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 iana-etc"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (6 preceding siblings ...)
2023-10-02 15:38 ` ar-jan
@ 2023-10-03 8:43 ` ar-jan
2023-10-03 16:21 ` ar-jan
` (18 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-03 8:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 15127 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From c99ecf40a7f09e255e57b99f352b084d3c472d8f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..fd60ed208d61a
--- /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-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 <arjanmossel@gmail.com>"
+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 09f67843fec61b066be587e7358034e202e1f3fe Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 3d5df79b3547533686f6ae5387ac48a79228220b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 0deb791b429dda8556a6b8b9b1db52d43964c73b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 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..af08e13e36f0a
--- /dev/null
+++ b/srcpkgs/python3-proxy.py/template
@@ -0,0 +1,29 @@
+# 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 <arjanmossel@gmail.com>"
+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; and test_wait_for_server_raises_timeout_error
+ # errors on CI with "OSError: [Errno 99] Cannot assign requested address"
+ PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not (test_integration or test_wait_for_server_raises_timeout_error)'
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 94bd7194d3b88eb2bd245152ae459482ed189cf7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 34 ++++++++++++++-----
2 files changed, 26 insertions(+), 38 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] <support@github.com>
-
-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..0e6ade6317047 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,39 @@
# 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-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 <maldridge@voidlinux.org>"
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 42c6f8f2ff35a89d6b9ab1948eac3e065cf8c12e Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 9/9] python3-aiohttp_socks: update to 0.8.4.
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..6d24e0f2800cb 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.4
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 iana-etc"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (7 preceding siblings ...)
2023-10-03 8:43 ` ar-jan
@ 2023-10-03 16:21 ` ar-jan
2023-10-10 18:33 ` ar-jan
` (17 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-03 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 15145 bytes --]
From 642704250b5ad64137d4df8bea97b1da375abe88 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From c99ecf40a7f09e255e57b99f352b084d3c472d8f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..fd60ed208d61a
--- /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-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 <arjanmossel@gmail.com>"
+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 09f67843fec61b066be587e7358034e202e1f3fe Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 3d5df79b3547533686f6ae5387ac48a79228220b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 0deb791b429dda8556a6b8b9b1db52d43964c73b Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 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..af08e13e36f0a
--- /dev/null
+++ b/srcpkgs/python3-proxy.py/template
@@ -0,0 +1,29 @@
+# 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 <arjanmossel@gmail.com>"
+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; and test_wait_for_server_raises_timeout_error
+ # errors on CI with "OSError: [Errno 99] Cannot assign requested address"
+ PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not (test_integration or test_wait_for_server_raises_timeout_error)'
+}
+
+post_install() {
+ vlicense LICENSE
+}
From 94bd7194d3b88eb2bd245152ae459482ed189cf7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 34 ++++++++++++++-----
2 files changed, 26 insertions(+), 38 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] <support@github.com>
-
-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..0e6ade6317047 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,39 @@
# 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-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 <maldridge@voidlinux.org>"
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 80a524451dab1845d136a0bb46a76a5ee4293e59 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 9/9] python3-aiohttp_socks: update to 0.8.4.
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..bed27a8e37dff 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.4
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 iana-etc python3-dnspython"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (8 preceding siblings ...)
2023-10-03 16:21 ` ar-jan
@ 2023-10-10 18:33 ` ar-jan
2023-10-14 15:30 ` ahesford
` (16 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-10 18:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.3 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 15159 bytes --]
From ebe074496016ce4aa6f3b071658781405117578f Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 fc75af18e236cab09b260d92164c1fee286db9c2 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From 445ffdbc92f05ba74f53ce8395c38aaece09d663 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From bb5574a21496f77337b04637594698656ac645cb Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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..fd60ed208d61a
--- /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-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 <arjanmossel@gmail.com>"
+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 e09daa00ee5c21775c4fd9de50034f54dd9f7310 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 9ac63119dade0..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=6
+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 e726f49439a703bbe05c2e83b827b224ad78a668 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 <arjanmossel@gmail.com>"
+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 9922dca94ef6110f4295deed55cf364877869376 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 29 +++++++++++++++++++++++++++++
1 file changed, 29 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..af08e13e36f0a
--- /dev/null
+++ b/srcpkgs/python3-proxy.py/template
@@ -0,0 +1,29 @@
+# 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 <arjanmossel@gmail.com>"
+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; and test_wait_for_server_raises_timeout_error
+ # errors on CI with "OSError: [Errno 99] Cannot assign requested address"
+ PYTHONPATH=$(cd build/lib* && pwd) pytest -k 'not (test_integration or test_wait_for_server_raises_timeout_error)'
+}
+
+post_install() {
+ vlicense LICENSE
+}
From c603ca403cd910a9fbc12d1af50f7047ec144ff7 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
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 | 34 ++++++++++++++-----
2 files changed, 26 insertions(+), 38 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] <support@github.com>
-
-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 bd88c59be31dd..0e6ade6317047 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,39 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
-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-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 <maldridge@voidlinux.org>"
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 39f6e9017ad005df5bc688437355a6229f65017d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 9/9] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..bed27a8e37dff 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
-revision=2
+version=0.8.4
+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 iana-etc python3-dnspython"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (9 preceding siblings ...)
2023-10-10 18:33 ` ar-jan
@ 2023-10-14 15:30 ` ahesford
2023-10-16 22:18 ` ar-jan
` (15 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2023-10-14 15:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1762969106
Comment:
I suggest dropping all of the new packages added just to support checks. If those checks requiring these packages can be skipped, great; otherwise, just skip all of the checks.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.3 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (10 preceding siblings ...)
2023-10-14 15:30 ` ahesford
@ 2023-10-16 22:18 ` ar-jan
2023-11-13 15:11 ` [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 " ar-jan
` (14 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-10-16 22:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1598 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1765361747
Comment:
OK, I've removed these new dependencies:
> New package: python3-httpx-socks-0.7.8
> New package: python3-tiny-proxy-0.2.0
> New package: python3-re_assert-1.1.0
> New package: python3-proxy.py-2.4.3
But python3-aiosignal is required for python3-aiohttp, and depends on python3-frozenlist (not just for tests). Previously tests were passing, now I get this for python3-aiosignal:
```
$ ./xbps-src pkg -Q python3-aiosignal
...
=> python3-aiosignal-1.3.1_1: building with [python3-module] [python3] for x86_64...
...
[check] python3-frozenlist-1.4.0_1: found (/host/binpkgs/aiohttp-socks084-fewer-deps)
[runtime] python3-frozenlist-1.4.0_1: found (/host/binpkgs/aiohttp-socks084-fewer-deps)
...
==================================== ERRORS ====================================
____________________ ERROR collecting tests/test_signals.py ____________________
ImportError while importing test module '/builddir/python3-aiosignal-1.3.1/tests/test_signals.py'.
Hint: make sure your test modules/packages have valid Python names.
Traceback:
/usr/lib/python3.12/importlib/__init__.py:90: in import_module
return _bootstrap._gcd_import(name[level:], package, level)
tests/test_signals.py:6: in <module>
from aiosignal import Signal
aiosignal/__init__.py:1: in <module>
from frozenlist import FrozenList
E ModuleNotFoundError: No module named 'frozenlist'
```
Could this have anything to do with the move to Python 3.12?
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (11 preceding siblings ...)
2023-10-16 22:18 ` ar-jan
@ 2023-11-13 15:11 ` ar-jan
2023-11-13 15:18 ` ar-jan
` (13 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-13 15:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1472 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.4 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to python3-aiohttp_socks:
- New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
- New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests
- New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests
- python3-aiohttp: update to 3.8.5: needed for passing python3-aiohttp_socks tests
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 9062 bytes --]
From a85bd6df34fb7ec57fbeb082835fabef952b6821 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 +0200
Subject: [PATCH 1/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From 8bd546b61d68a9c3124c896feb5b9c174a6500c9 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:38:07 +0200
Subject: [PATCH 2/5] New package: python3-aiosignal-1.3.1
---
srcpkgs/python3-aiosignal/template | 16 ++++++++++++++++
1 file changed, 16 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..c17a80c196510
--- /dev/null
+++ b/srcpkgs/python3-aiosignal/template
@@ -0,0 +1,16 @@
+# 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
+make_check=no # frozenlist ModuleNotFoundError
From 3d7676ca594886fa812990a325b4df2e0e009a77 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:22:43 +0200
Subject: [PATCH 3/5] 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 9ac63119dade0..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=6
+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 48004ed5e6e39c1191c62beb6b5323687f1e98a5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 4/5] python3-aiohttp: update to 3.9.0b1
Version 3.9.0 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests; now depends on proxy.py and re_assert
---
.../patches/chardet-version.patch | 30 -------------------
srcpkgs/python3-aiohttp/template | 18 ++++++-----
2 files changed, 11 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] <support@github.com>
-
-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 bd88c59be31dd..c9e8a8b781c1d 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,25 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
+version=3.9.0b1
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+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-async_generator python3-Brotli
+ python3-charset-normalizer python3-freezegun python3-pytest
+ python3-pytest-cov python3-pytest-forked python3-pytest-mock
+ python3-pytest-timeout python3-pytest-xdist"
short_desc="HTTP client/server for asyncio (PEP-3156)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://aiohttp.readthedocs.io/"
distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=d6e120b08ac168825239c64e0a850a108edb9cd17be247e25bced9b07a14a403
+make_check=no # Depends on proxy.py and re_assert
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
}
From bb7602a2cde79cdf1e43cfdbbf74e971fc0335fb Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 5/5] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..1a156a2dc0d62 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,14 +1,18 @@
# Template file for 'python3-aiohttp_socks'
pkgname=python3-aiohttp_socks
-version=0.8.0
-revision=2
+version=0.8.4
+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-cchardet python3-charset-normalizer python3-aiosignal iana-etc
+ python3-dnspython"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
+make_check=no # Requires python3-tiny-proxy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (12 preceding siblings ...)
2023-11-13 15:11 ` [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 " ar-jan
@ 2023-11-13 15:18 ` ar-jan
2023-11-13 15:24 ` ar-jan
` (12 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-13 15:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 506 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1808363232
Comment:
I bumped python3-aiohttp to prerelease 3.9.0b1 for [compatibility with Python 3.12](https://github.com/aio-libs/aiohttp/issues/7639#issuecomment-1751995946). Version 3.8.6 or earlier do not compile.
I don't know why `frozenlist` module cannot be imported in the tests for `python3-aiosignal` (I believe these tests ran successfully before Python 3.12, not sure).
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (13 preceding siblings ...)
2023-11-13 15:18 ` ar-jan
@ 2023-11-13 15:24 ` ar-jan
2023-11-13 16:45 ` [PR REVIEW] " ahesford
` (11 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-13 15:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1808363232
Comment:
I bumped python3-aiohttp to prerelease 3.9.0b1 for [compatibility with Python 3.12](https://github.com/aio-libs/aiohttp/issues/7639#issuecomment-1751995946). Version 3.8.6 or earlier do not compile.
I don't know why `frozenlist` module cannot be imported in the tests for `python3-aiosignal` (I believe these tests ran successfully before Python 3.12, not sure), but used `make_check=no`.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR REVIEW] python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (15 preceding siblings ...)
2023-11-13 16:45 ` [PR REVIEW] " ahesford
@ 2023-11-13 16:45 ` ahesford
2023-11-13 17:32 ` [PR PATCH] [Updated] " ar-jan
` (9 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2023-11-13 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 285 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#discussion_r1391367177
Comment:
If tests are disabled here because they require dependencies not packaged for Void, the entire list of `checkdepends` should be dropped.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR REVIEW] python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (14 preceding siblings ...)
2023-11-13 15:24 ` ar-jan
@ 2023-11-13 16:45 ` ahesford
2023-11-13 16:45 ` ahesford
` (10 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2023-11-13 16:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#discussion_r1391376274
Comment:
The tests run fine for me, so there must be something on your end that needs to be resolved. In any case, please reinstate the tests.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (16 preceding siblings ...)
2023-11-13 16:45 ` ahesford
@ 2023-11-13 17:32 ` ar-jan
2023-11-13 17:35 ` ar-jan
` (8 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-13 17:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.4 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to update python3-aiohttp_socks (I've now removed packages added only for satisfying tests):
- ~~New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests~~
- ~~New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests~~
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- ~~New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests~~
- ~~New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests~~
- python3-aiohttp: update to 3.9.0b1: needed for passing python3-aiohttp_socks tests; prerelease needed for Python 3.12 compatibility
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 8534 bytes --]
From a85bd6df34fb7ec57fbeb082835fabef952b6821 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 +0200
Subject: [PATCH 1/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From 1db9daf4a9252f92ec66f0f025b193c66782b10d Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:38:07 +0200
Subject: [PATCH 2/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From c355cea668f246b6e82943da2832a097d53bcddf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:22:43 +0200
Subject: [PATCH 3/5] 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 9ac63119dade0..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=6
+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 44d3a463a40110cf5ef6c8be392655c2135b5a54 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 4/5] python3-aiohttp: update to 3.9.0b1
Version 3.9.0 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests; now depends on proxy.py and re_assert
---
.../patches/chardet-version.patch | 30 -------------------
srcpkgs/python3-aiohttp/template | 14 ++++-----
2 files changed, 7 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] <support@github.com>
-
-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 bd88c59be31dd..8b1b02dd703d9 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,21 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
+version=3.9.0b1
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+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"
short_desc="HTTP client/server for asyncio (PEP-3156)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://aiohttp.readthedocs.io/"
distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=d6e120b08ac168825239c64e0a850a108edb9cd17be247e25bced9b07a14a403
+make_check=no # Depends on proxy.py and re_assert
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
}
From 7046ae6b027d16a3c6d80f9c59db587e4dfd1a74 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 5/5] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..11f8f7fc149b5 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,14 +1,14 @@
# Template file for 'python3-aiohttp_socks'
pkgname=python3-aiohttp_socks
-version=0.8.0
-revision=2
+version=0.8.4
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-aiohttp python3-socks"
-checkdepends="python3-aiohttp python3-attrs python3-socks"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
+make_check=no # Requires python3-tiny-proxy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (17 preceding siblings ...)
2023-11-13 17:32 ` [PR PATCH] [Updated] " ar-jan
@ 2023-11-13 17:35 ` ar-jan
2023-11-15 13:37 ` ar-jan
` (7 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-13 17:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1808650895
Comment:
Updated. After nuking my `masterdir` and `hostdir`, tests using frozenlist worked again. No idea how that got messed up.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (18 preceding siblings ...)
2023-11-13 17:35 ` ar-jan
@ 2023-11-15 13:37 ` ar-jan
2023-11-15 14:17 ` ar-jan
` (6 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-15 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1812550639
Comment:
`aiohttp-3.9.0rc0` was just released, I'll bump it.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (19 preceding siblings ...)
2023-11-15 13:37 ` ar-jan
@ 2023-11-15 14:17 ` ar-jan
2023-11-15 21:04 ` [PR PATCH] [Updated] " ar-jan
` (5 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-15 14:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1808363232
Comment:
I bumped python3-aiohttp to prerelease 3.9.0b1 for [compatibility with Python 3.12](https://github.com/aio-libs/aiohttp/issues/7639#issuecomment-1751995946). Version 3.8.6 or earlier do not compile.
~~I don't know why `frozenlist` module cannot be imported in the tests for `python3-aiosignal` (I believe these tests ran successfully before Python 3.12, not sure), but used `make_check=no`.~~
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (20 preceding siblings ...)
2023-11-15 14:17 ` ar-jan
@ 2023-11-15 21:04 ` ar-jan
2023-11-15 21:32 ` ar-jan
` (4 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-15 21:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.4 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to update python3-aiohttp_socks (I've now removed packages added only for satisfying tests):
- ~~New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests~~
- ~~New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests~~
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- ~~New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests~~
- ~~New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests~~
- python3-aiohttp: update to 3.9.0b1: needed for passing python3-aiohttp_socks tests; prerelease needed for Python 3.12 compatibility
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 8535 bytes --]
From 6a43f6aba75ef6abff0fb05c19f068a33dc2a4aa Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 +0200
Subject: [PATCH 1/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From d39faa922ef407e39a6361ee2c7a65ccb61e62cf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:38:07 +0200
Subject: [PATCH 2/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From fd999d276e6a9d21c16c90ae7d819f6523911ad5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:22:43 +0200
Subject: [PATCH 3/5] 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 9ac63119dade0..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=6
+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 d46abd1cb353c001f80be3cc6ca590b931517e90 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 4/5] python3-aiohttp: update to 3.9.0b1
Version 3.9.0 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests; now depends on proxy.py and re_assert
---
.../patches/chardet-version.patch | 30 -------------------
srcpkgs/python3-aiohttp/template | 14 ++++-----
2 files changed, 7 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] <support@github.com>
-
-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 bd88c59be31dd..2cd42da775539 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,21 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
+version=3.9.0rc0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+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"
short_desc="HTTP client/server for asyncio (PEP-3156)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://aiohttp.readthedocs.io/"
distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=486e5d48681d9cd016ba911815f9b91cccb1f8edae44953431d0b5143995094d
+make_check=no # Depends on proxy.py and re_assert
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
}
From 49726eb28a4ee96d84852b5f7adb0aea9c13b066 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 5/5] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..11f8f7fc149b5 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,14 +1,14 @@
# Template file for 'python3-aiohttp_socks'
pkgname=python3-aiohttp_socks
-version=0.8.0
-revision=2
+version=0.8.4
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-aiohttp python3-socks"
-checkdepends="python3-aiohttp python3-attrs python3-socks"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
+make_check=no # Requires python3-tiny-proxy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 and add required dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (21 preceding siblings ...)
2023-11-15 21:04 ` [PR PATCH] [Updated] " ar-jan
@ 2023-11-15 21:32 ` ar-jan
2023-11-18 10:36 ` [PR PATCH] [Updated] Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies ar-jan
` (3 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-15 21:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1606 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
python3-aiohttp_socks: update to 0.8.4 and add required dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to update python3-aiohttp_socks (I've now removed packages added only for satisfying tests):
- ~~New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests~~
- ~~New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests~~
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- ~~New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests~~
- ~~New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests~~
- python3-aiohttp: update to 3.9.0b1: needed for passing python3-aiohttp_socks tests; prerelease needed for Python 3.12 compatibility
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 8536 bytes --]
From 6a43f6aba75ef6abff0fb05c19f068a33dc2a4aa Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 +0200
Subject: [PATCH 1/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From d39faa922ef407e39a6361ee2c7a65ccb61e62cf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:38:07 +0200
Subject: [PATCH 2/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From fd999d276e6a9d21c16c90ae7d819f6523911ad5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:22:43 +0200
Subject: [PATCH 3/5] 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 9ac63119dade0..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=6
+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 03155cd0cae70010350fd1d25eedb118b9b81d31 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 4/5] python3-aiohttp: update to 3.9.0rc0
Version 3.9.0 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests; now depends on proxy.py and re_assert
---
.../patches/chardet-version.patch | 30 -------------------
srcpkgs/python3-aiohttp/template | 14 ++++-----
2 files changed, 7 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] <support@github.com>
-
-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 bd88c59be31dd..2cd42da775539 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,21 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
+version=3.9.0rc0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+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"
short_desc="HTTP client/server for asyncio (PEP-3156)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://aiohttp.readthedocs.io/"
distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=486e5d48681d9cd016ba911815f9b91cccb1f8edae44953431d0b5143995094d
+make_check=no # Depends on proxy.py and re_assert
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
}
From 4208ff2fda35fb9afdf6f68db3861077d4331a81 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 5/5] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..11f8f7fc149b5 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,14 +1,14 @@
# Template file for 'python3-aiohttp_socks'
pkgname=python3-aiohttp_socks
-version=0.8.0
-revision=2
+version=0.8.4
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-aiohttp python3-socks"
-checkdepends="python3-aiohttp python3-attrs python3-socks"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
+make_check=no # Requires python3-tiny-proxy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (22 preceding siblings ...)
2023-11-15 21:32 ` ar-jan
@ 2023-11-18 10:36 ` ar-jan
2023-11-26 20:47 ` ar-jan
` (2 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-18 10:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1624 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
I accidentally had to add and update multiple packages in order to update python3-aiohttp_socks (I've now removed packages added only for satisfying tests):
- ~~New package: python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests~~
- ~~New package: python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests~~
- New package: python3-aiosignal-1.3.1: needed for python3-tiny-proxy tests, and python3-aiohttp v3.8
- New package: python3-frozenlist-1.4.0: needed for python3-aiosignal
- ~~New package: python3-proxy.py-2.4.3: needed for python3-aiohttp tests~~
- ~~New package: python3-re_assert-1.1.0: needed for python3-aiohttp tests~~
- python3-aiohttp: update to 3.9.0b1: needed for passing python3-aiohttp_socks tests; prerelease needed for Python 3.12 compatibility
- python3-async-timeout: update to 4.0.3: needed for python3-aiohttp v3.8
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 8530 bytes --]
From 6a43f6aba75ef6abff0fb05c19f068a33dc2a4aa Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 +0200
Subject: [PATCH 1/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From d39faa922ef407e39a6361ee2c7a65ccb61e62cf Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:38:07 +0200
Subject: [PATCH 2/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From fd999d276e6a9d21c16c90ae7d819f6523911ad5 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:22:43 +0200
Subject: [PATCH 3/5] 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 9ac63119dade0..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=6
+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 e014a17dd9cc46eeaa14b4284d8e1814a175321c Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 4/5] python3-aiohttp: update to 3.9.0
Version 3.9.0 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests; now depends on proxy.py and re_assert
---
.../patches/chardet-version.patch | 30 -------------------
srcpkgs/python3-aiohttp/template | 14 ++++-----
2 files changed, 7 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] <support@github.com>
-
-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 bd88c59be31dd..7b253706f9db4 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,21 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
+version=3.9.0
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+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"
short_desc="HTTP client/server for asyncio (PEP-3156)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://aiohttp.readthedocs.io/"
distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=09f23292d29135025e19e8ff4f0a68df078fe4ee013bca0105b2e803989de92d
+make_check=no # Depends on proxy.py and re_assert
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
}
From db33fb50fd9a55918a35794ce962c1fa64607a66 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 5/5] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..11f8f7fc149b5 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,14 +1,14 @@
# Template file for 'python3-aiohttp_socks'
pkgname=python3-aiohttp_socks
-version=0.8.0
-revision=2
+version=0.8.4
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-aiohttp python3-socks"
-checkdepends="python3-aiohttp python3-attrs python3-socks"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
+make_check=no # Requires python3-tiny-proxy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (23 preceding siblings ...)
2023-11-18 10:36 ` [PR PATCH] [Updated] Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies ar-jan
@ 2023-11-26 20:47 ` ar-jan
2023-11-26 20:55 ` ar-jan
2023-11-26 21:17 ` [PR PATCH] [Merged]: " ahesford
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-26 20:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1470 bytes --]
There is an updated pull request by ar-jan against master on the void-packages repository
https://github.com/ar-jan/void-packages aiohttp-socks083
https://github.com/void-linux/void-packages/pull/46383
Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New package: **python3-aiosignal**-1.3.1: needed for python3-aiohttp v3.8+
New package: **python3-frozenlist**-1.4.0: needed for python3-aiosignal
**python3-aiohttp**: update to 3.9.0: needed for passing python3-aiohttp_socks tests; 3.9.0 needed for Python 3.12 compatibility
**python3-async-timeout**: update to 4.0.3: needed for python3-aiohttp v3.8
Removed these packages added only for satisfying tests from the PR:
python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
python3-proxy.py-2.4.3: needed for python3-aiohttp tests
python3-re_assert-1.1.0: needed for python3-aiohttp tests
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
A patch file from https://github.com/void-linux/void-packages/pull/46383.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aiohttp-socks083-46383.patch --]
[-- Type: text/x-diff, Size: 8532 bytes --]
From 0856079bbbf098fba8af19e4cabc455d369364db Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:36:47 +0200
Subject: [PATCH 1/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/frozenlist"
+distfiles="${PYPI_SITE}/f/frozenlist/frozenlist-${version}.tar.gz"
+checksum=09163bdf0b2907454042edb19f887c6d33806adc71fbd54afc14908bfdc22251
From a7c1d759491a4192715f4ca1c32421bd51e1dac3 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:38:07 +0200
Subject: [PATCH 2/5] 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 <arjanmossel@gmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/aio-libs/aiosignal"
+distfiles="${PYPI_SITE}/a/aiosignal/aiosignal-${version}.tar.gz"
+checksum=54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc
From ef8daae95f87d6ec92e8b178f71a7f99dd5473df Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:22:43 +0200
Subject: [PATCH 3/5] 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 9ac63119dade0..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=6
+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 1e4fd5f02553c47e144915f03a8abda5c9e6d7a8 Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 12:45:04 +0200
Subject: [PATCH 4/5] python3-aiohttp: update to 3.9.1
Version 3.9 is required for Python 3.12
Requires python3-async-timeout>=4
Depends on python3-aiosignal
Disable tests which now depend on proxy.py and re_assert
---
.../patches/chardet-version.patch | 30 -------------------
srcpkgs/python3-aiohttp/template | 14 ++++-----
2 files changed, 7 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] <support@github.com>
-
-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 bd88c59be31dd..4678749133e09 100644
--- a/srcpkgs/python3-aiohttp/template
+++ b/srcpkgs/python3-aiohttp/template
@@ -1,21 +1,21 @@
# Template file for 'python3-aiohttp'
pkgname=python3-aiohttp
-version=3.7.4
-revision=5
+version=3.9.1
+revision=1
build_style=python3-module
-hostmakedepends="python3-setuptools"
+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"
short_desc="HTTP client/server for asyncio (PEP-3156)"
maintainer="Michael Aldridge <maldridge@voidlinux.org>"
license="Apache-2.0"
homepage="https://aiohttp.readthedocs.io/"
distfiles="${PYPI_SITE}/a/aiohttp/aiohttp-${version}.tar.gz"
-checksum=5d84ecc73141d0a0d61ece0742bb7ff5751b0657dab8405f899d3ceb104cc7de
+checksum=8fc49a87ac269d4529da45871e2ffb6874e87779c3d0e2ccd813c0899221239d
+make_check=no # Depends on proxy.py and re_assert
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
}
From 39d65c0cc7ebc31fea7b3f62099a43d72062cb2a Mon Sep 17 00:00:00 2001
From: Arjan Mossel <arjanmossel@gmail.com>
Date: Mon, 2 Oct 2023 13:52:26 +0200
Subject: [PATCH 5/5] python3-aiohttp_socks: update to 0.8.4.
Use GitHub for distfiles since PyPI package does not include tests
---
srcpkgs/python3-aiohttp_socks/template | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-aiohttp_socks/template b/srcpkgs/python3-aiohttp_socks/template
index b3899c64985d6..11f8f7fc149b5 100644
--- a/srcpkgs/python3-aiohttp_socks/template
+++ b/srcpkgs/python3-aiohttp_socks/template
@@ -1,14 +1,14 @@
# Template file for 'python3-aiohttp_socks'
pkgname=python3-aiohttp_socks
-version=0.8.0
-revision=2
+version=0.8.4
+revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
depends="python3-aiohttp python3-socks"
-checkdepends="python3-aiohttp python3-attrs python3-socks"
short_desc="SOCKS proxy connector for aiohttp"
maintainer="Christian Buschau <christian.buschau@mailbox.org>"
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=58154eaa319968743bc18c9f4c0718e86c2312828bc1e481856409365ef4e403
+make_check=no # Requires python3-tiny-proxy
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (24 preceding siblings ...)
2023-11-26 20:47 ` ar-jan
@ 2023-11-26 20:55 ` ar-jan
2023-11-26 21:17 ` [PR PATCH] [Merged]: " ahesford
26 siblings, 0 replies; 28+ messages in thread
From: ar-jan @ 2023-11-26 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New comment by ar-jan on void-packages repository
https://github.com/void-linux/void-packages/pull/46383#issuecomment-1826894317
Comment:
Updated to `aiohttp-3.9.1`.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Merged]: Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
` (25 preceding siblings ...)
2023-11-26 20:55 ` ar-jan
@ 2023-11-26 21:17 ` ahesford
26 siblings, 0 replies; 28+ messages in thread
From: ahesford @ 2023-11-26 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]
There's a merged pull request on the void-packages repository
Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies
https://github.com/void-linux/void-packages/pull/46383
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**
New package: **python3-aiosignal**-1.3.1: needed for python3-aiohttp v3.8+
New package: **python3-frozenlist**-1.4.0: needed for python3-aiosignal
**python3-aiohttp**: update to 3.9.0: needed for passing python3-aiohttp_socks tests; 3.9.0 needed for Python 3.12 compatibility
**python3-async-timeout**: update to 4.0.3: needed for python3-aiohttp v3.8
Removed these packages added only for satisfying tests from the PR:
python3-tiny-proxy-0.2.0: needed for python3-aiohttp_socks tests
python3-httpx-socks-0.7.8: needed for python3-tiny-proxy tests
python3-proxy.py-2.4.3: needed for python3-aiohttp tests
python3-re_assert-1.1.0: needed for python3-aiohttp tests
@the-maldridge would you care to take a look at this since you maintain python3-aiohttp and python3-async-timeout?
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-11-26 21:17 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-02 13:48 [PR PATCH] python3-aiohttp_socks: update to 0.8.3 and add required dependencies ar-jan
2023-10-02 13:54 ` [PR PATCH] [Updated] " ar-jan
2023-10-02 13:57 ` ar-jan
2023-10-02 14:17 ` ar-jan
2023-10-02 14:30 ` [PR PATCH] [Updated] " ar-jan
2023-10-02 14:46 ` ar-jan
2023-10-02 15:03 ` ar-jan
2023-10-02 15:38 ` ar-jan
2023-10-03 8:43 ` ar-jan
2023-10-03 16:21 ` ar-jan
2023-10-10 18:33 ` ar-jan
2023-10-14 15:30 ` ahesford
2023-10-16 22:18 ` ar-jan
2023-11-13 15:11 ` [PR PATCH] [Updated] python3-aiohttp_socks: update to 0.8.4 " ar-jan
2023-11-13 15:18 ` ar-jan
2023-11-13 15:24 ` ar-jan
2023-11-13 16:45 ` [PR REVIEW] " ahesford
2023-11-13 16:45 ` ahesford
2023-11-13 17:32 ` [PR PATCH] [Updated] " ar-jan
2023-11-13 17:35 ` ar-jan
2023-11-15 13:37 ` ar-jan
2023-11-15 14:17 ` ar-jan
2023-11-15 21:04 ` [PR PATCH] [Updated] " ar-jan
2023-11-15 21:32 ` ar-jan
2023-11-18 10:36 ` [PR PATCH] [Updated] Update python3-aiohttp_socks, python3-aiohttp, python3-async-timeout; add dependencies ar-jan
2023-11-26 20:47 ` ar-jan
2023-11-26 20:55 ` ar-jan
2023-11-26 21:17 ` [PR PATCH] [Merged]: " ahesford
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).