* [gentoo-commits] repo/gentoo:master commit in: dev-python/uvicorn/, dev-python/uvicorn/files/
@ 2021-02-24 0:06 Louis Sautier
0 siblings, 0 replies; 3+ messages in thread
From: Louis Sautier @ 2021-02-24 0:06 UTC (permalink / raw
To: gentoo-commits
commit: 2070b7a4935339213b16d8200b64af925cdf120d
Author: Louis Sautier <sbraz <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 17:12:55 2021 +0000
Commit: Louis Sautier <sbraz <AT> gentoo <DOT> org>
CommitDate: Wed Feb 24 00:04:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2070b7a4
dev-python/uvicorn: new package, version 0.13.4
Indirect dependency of dev-python/denonavr.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Louis Sautier <sbraz <AT> gentoo.org>
dev-python/uvicorn/Manifest | 1 +
.../files/uvicorn-0.13.4-fix-wsproto-1.0.patch | 31 ++++++++++++++
dev-python/uvicorn/metadata.xml | 13 ++++++
dev-python/uvicorn/uvicorn-0.13.4.ebuild | 50 ++++++++++++++++++++++
4 files changed, 95 insertions(+)
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
new file mode 100644
index 00000000000..ee9b0e8f29c
--- /dev/null
+++ b/dev-python/uvicorn/Manifest
@@ -0,0 +1 @@
+DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
diff --git a/dev-python/uvicorn/files/uvicorn-0.13.4-fix-wsproto-1.0.patch b/dev-python/uvicorn/files/uvicorn-0.13.4-fix-wsproto-1.0.patch
new file mode 100644
index 00000000000..da3038d6db4
--- /dev/null
+++ b/dev-python/uvicorn/files/uvicorn-0.13.4-fix-wsproto-1.0.patch
@@ -0,0 +1,31 @@
+https://github.com/encode/uvicorn/pull/892
+
+diff --git a/tests/protocols/test_http.py b/tests/protocols/test_http.py
+index f35a965d..25110fc6 100644
+--- a/tests/protocols/test_http.py
++++ b/tests/protocols/test_http.py
+@@ -67,6 +67,7 @@
+ b"Host: example.org",
+ b"Connection: upgrade",
+ b"Upgrade: websocket",
++ b"Sec-WebSocket-Version: 11",
+ b"",
+ b"",
+ ]
+diff --git a/tests/protocols/test_websocket.py b/tests/protocols/test_websocket.py
+index 24bc285f..7c3fcc08 100644
+--- a/tests/protocols/test_websocket.py
++++ b/tests/protocols/test_websocket.py
+@@ -51,7 +51,11 @@ def app(scope):
+ async with httpx.AsyncClient() as client:
+ response = await client.get(
+ "http://127.0.0.1:8000",
+- headers={"upgrade": "websocket", "connection": "upgrade"},
++ headers={
++ "upgrade": "websocket",
++ "connection": "upgrade",
++ "sec-webSocket-version": "11",
++ },
+ timeout=5,
+ )
+ if response.status_code == 426:
diff --git a/dev-python/uvicorn/metadata.xml b/dev-python/uvicorn/metadata.xml
new file mode 100644
index 00000000000..1454d51b226
--- /dev/null
+++ b/dev-python/uvicorn/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="pypi">uvicorn</remote-id>
+ <remote-id type="github">encode/uvicorn</remote-id>
+ <bugs-to>https://github.com/encode/uvicorn/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
diff --git a/dev-python/uvicorn/uvicorn-0.13.4.ebuild b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
new file mode 100644
index 00000000000..afae4f63302
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# entry points are used
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="https://www.uvicorn.org/"
+SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ =dev-python/click-7*[${PYTHON_USEDEP}]
+ >=dev-python/h11-0.8[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_7)
+"
+BDEPEND="
+ test? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/httpx[${PYTHON_USEDEP}]
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ dev-python/trustme[${PYTHON_USEDEP}]
+ dev-python/websockets[${PYTHON_USEDEP}]
+ dev-python/wsproto[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-wsproto-1.0.patch"
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+ # watchgod is not in the tree
+ sed -e '/^from uvicorn.supervisors.watchgodreload/d' \
+ -e 's/, WatchGodReload//' \
+ -i tests/supervisors/test_reload.py
+ distutils-r1_python_prepare_all
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/uvicorn/, dev-python/uvicorn/files/
@ 2024-02-03 9:17 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-02-03 9:17 UTC (permalink / raw
To: gentoo-commits
commit: bc18e9350b4225766d93e65f7fd52e9b61c0bac0
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 3 09:10:39 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb 3 09:10:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc18e935
dev-python/uvicorn: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/uvicorn/Manifest | 1 -
dev-python/uvicorn/files/uvicorn-0.25.0-test.patch | 46 -------------
dev-python/uvicorn/uvicorn-0.25.0.ebuild | 77 ----------------------
3 files changed, 124 deletions(-)
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index db3685c79b14..6545dabda214 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,3 +1,2 @@
-DIST uvicorn-0.25.0.gh.tar.gz 717386 BLAKE2B f0a472676a732d7807137f157c95574584d882bf9ae8531c4e2c1164ebe9eec2172da62f72f07032ada422b7932f221457686aa22ab6fbceac57685ad91920b8 SHA512 19c1e6438c40ab1b1d30c9c9c84d65f2dc661197adcc6be3d7825223d933d4554ec388323e16452ef0409476766af1ae18bb3252a391099bd2e2bfe2b6c4abb2
DIST uvicorn-0.26.0.gh.tar.gz 717758 BLAKE2B 1ac4d28a6351a8e9fc9d4e0481237dd8b3265afcfd2c554093299bb6d03570809edf44a1c6278441c1a8611d380aacbfa99986ebac99b19e65d055c78c28e494 SHA512 3b561f3b5335bd52093d5aab2ab9db101a2a36f06179fe02a177a5de4dc336f2aaf700b45ceb7c0952d0b3e5e2a3bdf0387b978ac46af96def409e189bacfa23
DIST uvicorn-0.27.0.gh.tar.gz 718371 BLAKE2B a8e5504f673add3e0babb2fefa9d045adc34062b7746c1149c1a7a467073495f07d26b23f0d81678698f41d7887eb28aeaffe29f29706c84be39d5b8f3d85b1b SHA512 2337223e30dcc89a32babfce6b381f53225df3ea319e13ae8b758b4a1801ec49a1e8c2caa148757fe715504b75934a6a75156c6e7146fb21335905f1425f89fa
diff --git a/dev-python/uvicorn/files/uvicorn-0.25.0-test.patch b/dev-python/uvicorn/files/uvicorn-0.25.0-test.patch
deleted file mode 100644
index 8cd1cc7bb8c4..000000000000
--- a/dev-python/uvicorn/files/uvicorn-0.25.0-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 64013e8729afc93880a749974491ab5a90b29deb Mon Sep 17 00:00:00 2001
-From: Marcelo Trylesinski <marcelotryle@gmail.com>
-Date: Tue, 26 Dec 2023 10:28:55 +0100
-Subject: [PATCH] Allow test suite to run without httptools installed
-
----
- tests/protocols/test_http.py | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
-diff --git a/tests/protocols/test_http.py b/tests/protocols/test_http.py
-index fde4cc70b..ca06b33a6 100644
---- a/tests/protocols/test_http.py
-+++ b/tests/protocols/test_http.py
-@@ -994,25 +994,20 @@ async def test_huge_headers_h11_max_incomplete():
-
-
- @pytest.mark.anyio
--@pytest.mark.parametrize(
-- "protocol_cls,close_header",
-- (
-- pytest.param(
-- HttpToolsProtocol, b"connection: close", marks=skip_if_no_httptools
-- ),
-- (H11Protocol, b"Connection: close"),
-- ),
--)
--async def test_return_close_header(protocol_cls, close_header: bytes):
-+async def test_return_close_header(
-+ http_protocol_cls: "Type[HttpToolsProtocol | H11Protocol]"
-+):
- app = Response("Hello, world", media_type="text/plain")
-
-- protocol = get_connected_protocol(app, protocol_cls)
-+ protocol = get_connected_protocol(app, http_protocol_cls)
- protocol.data_received(CONNECTION_CLOSE_REQUEST)
- await protocol.loop.run_one()
- assert b"HTTP/1.1 200 OK" in protocol.transport.buffer
- assert b"content-type: text/plain" in protocol.transport.buffer
- assert b"content-length: 12" in protocol.transport.buffer
-- assert close_header in protocol.transport.buffer
-+ # NOTE: We need to use `.lower()` because H11 implementation doesn't allow Uvicorn
-+ # to lowercase them. See: https://github.com/python-hyper/h11/issues/156
-+ assert b"connection: close" in protocol.transport.buffer.lower()
-
-
- @pytest.mark.anyio
diff --git a/dev-python/uvicorn/uvicorn-0.25.0.ebuild b/dev-python/uvicorn/uvicorn-0.25.0.ebuild
deleted file mode 100644
index 252e5fca15d0..000000000000
--- a/dev-python/uvicorn/uvicorn-0.25.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( pypy3 python3_{10..12} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Lightning-fast ASGI server implementation"
-HOMEPAGE="
- https://www.uvicorn.org/
- https://github.com/encode/uvicorn/
- https://pypi.org/project/uvicorn/
-"
-# as of 0.21.0, no tests in sdist
-SRC_URI="
- https://github.com/encode/uvicorn/archive/${PV}.tar.gz
- -> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test-rust"
-
-RDEPEND="
- >=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
- >=dev-python/click-7.0[${PYTHON_USEDEP}]
- >=dev-python/h11-0.8[${PYTHON_USEDEP}]
-"
-BDEPEND="
- test? (
- dev-python/a2wsgi[${PYTHON_USEDEP}]
- dev-python/httpx[${PYTHON_USEDEP}]
- dev-python/pytest-asyncio[${PYTHON_USEDEP}]
- dev-python/pytest-mock[${PYTHON_USEDEP}]
- dev-python/python-dotenv[${PYTHON_USEDEP}]
- dev-python/pyyaml[${PYTHON_USEDEP}]
- >=dev-python/websockets-10.4[${PYTHON_USEDEP}]
- dev-python/wsproto[${PYTHON_USEDEP}]
- test-rust? (
- dev-python/cryptography[${PYTHON_USEDEP}]
- dev-python/trustme[${PYTHON_USEDEP}]
- dev-python/watchfiles[${PYTHON_USEDEP}]
- )
- )
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- # https://github.com/encode/uvicorn/pull/2198
- "${FILESDIR}/${P}-test.patch"
-)
-
-python_test() {
- local EPYTEST_DESELECT=(
- # too long path for unix socket
- tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
- )
- case ${EPYTHON} in
- pypy3)
- # TODO
- EPYTEST_DESELECT+=(
- tests/middleware/test_logging.py::test_running_log_using_fd
- )
- ;;
- esac
-
- epytest
-}
-
-pkg_postinst() {
- optfeature "auto reload on file changes" dev-python/watchfiles
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/uvicorn/, dev-python/uvicorn/files/
@ 2024-09-28 7:42 Michał Górny
0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2024-09-28 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 5fb9e4e83712855d2797f0f2020e86297f61eb30
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 28 06:40:17 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 07:42:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fb9e4e8
dev-python/uvicorn: Bump to 0.31.0
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/uvicorn/Manifest | 1 +
.../uvicorn/files/uvicorn-0.31.0-ws-0.13.patch | 25 +++++++
dev-python/uvicorn/uvicorn-0.31.0.ebuild | 80 ++++++++++++++++++++++
3 files changed, 106 insertions(+)
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 0e8b8104d1c5..f28ac7d5fec0 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1 +1,2 @@
DIST uvicorn-0.30.6.gh.tar.gz 724296 BLAKE2B c95ee6764947e51958da2e62627d20bfbef48f065832f6214c7c05b9daf344b76eb6b0ec4ccbc3ebc2502b9f2cc77157dcf90e824cec0a8adc62601ceb4abf0c SHA512 d4c4410648509b14e18c3c86a33df4152e951703d287153a26ad35f4dce35eb594b940d3773cb444119b9bfa72ae3885c54d84b1a09c0c6069b80941f453c2e8
+DIST uvicorn-0.31.0.gh.tar.gz 728288 BLAKE2B 8cdc15895be8689cb38c402beac415463b185d2402484e16cac28d51e4ef7359a23e084163761abe62483a02d987555dda628938c5b93cdf19e5759372598557 SHA512 d1d8875681ecb81febac2eb1d00d245f421bfb3d06c91be831daf11411c94368707afde8781147752bcd327fa3eb83cff1635f24b9d57107675e69c12885950d
diff --git a/dev-python/uvicorn/files/uvicorn-0.31.0-ws-0.13.patch b/dev-python/uvicorn/files/uvicorn-0.31.0-ws-0.13.patch
new file mode 100644
index 000000000000..c0e89b47b801
--- /dev/null
+++ b/dev-python/uvicorn/files/uvicorn-0.31.0-ws-0.13.patch
@@ -0,0 +1,25 @@
+From c5966796a772d1e6504fd5c7f3e4678ede1a5a29 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 28 Sep 2024 08:50:03 +0200
+Subject: [PATCH] Update test_websocket.py::test_invalid_upgrade for
+ websockets==0.13*
+
+Update the expected messages in
+`tests/protocols/test_websocket.py::test_invalid_upgrade[websockets-h11]`
+to cover the new variant emitted by websockets==0.13*.
+---
+ tests/protocols/test_websocket.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/protocols/test_websocket.py b/tests/protocols/test_websocket.py
+index 074c01d03..78c65d635 100644
+--- a/tests/protocols/test_websocket.py
++++ b/tests/protocols/test_websocket.py
+@@ -114,6 +114,7 @@ def app(scope: Scope):
+ "missing or empty sec-websocket-key header", # wsproto
+ "failed to open a websocket connection: missing " "sec-websocket-key header",
+ "failed to open a websocket connection: missing or empty " "sec-websocket-key header",
++ "failed to open a websocket connection: missing sec-websocket-key header; 'sec-websocket-key'",
+ ]
+ )
+
diff --git a/dev-python/uvicorn/uvicorn-0.31.0.ebuild b/dev-python/uvicorn/uvicorn-0.31.0.ebuild
new file mode 100644
index 000000000000..6aaf8d360663
--- /dev/null
+++ b/dev-python/uvicorn/uvicorn-0.31.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{10..13} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Lightning-fast ASGI server implementation"
+HOMEPAGE="
+ https://www.uvicorn.org/
+ https://github.com/encode/uvicorn/
+ https://pypi.org/project/uvicorn/
+"
+# as of 0.28.0, no tests in sdist
+SRC_URI="
+ https://github.com/encode/uvicorn/archive/${PV}.tar.gz
+ -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test-rust"
+
+RDEPEND="
+ >=dev-python/asgiref-3.4.0[${PYTHON_USEDEP}]
+ >=dev-python/click-7.0[${PYTHON_USEDEP}]
+ >=dev-python/h11-0.8[${PYTHON_USEDEP}]
+ $(python_gen_cond_dep '
+ >=dev-python/typing-extensions-4.0[${PYTHON_USEDEP}]
+ ' 3.10)
+"
+BDEPEND="
+ test? (
+ dev-python/a2wsgi[${PYTHON_USEDEP}]
+ dev-python/httpx[${PYTHON_USEDEP}]
+ dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+ dev-python/pytest-mock[${PYTHON_USEDEP}]
+ dev-python/python-dotenv[${PYTHON_USEDEP}]
+ dev-python/pyyaml[${PYTHON_USEDEP}]
+ >=dev-python/websockets-10.4[${PYTHON_USEDEP}]
+ dev-python/wsproto[${PYTHON_USEDEP}]
+ test-rust? (
+ dev-python/cryptography[${PYTHON_USEDEP}]
+ dev-python/trustme[${PYTHON_USEDEP}]
+ dev-python/watchfiles[${PYTHON_USEDEP}]
+ )
+ )
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+ # https://github.com/encode/uvicorn/pull/2470
+ "${FILESDIR}/${P}-ws-0.13.patch"
+)
+
+python_test() {
+ local EPYTEST_DESELECT=(
+ # too long path for unix socket
+ tests/test_config.py::test_bind_unix_socket_works_with_reload_or_workers
+ )
+ case ${EPYTHON} in
+ pypy3)
+ # TODO
+ EPYTEST_DESELECT+=(
+ tests/middleware/test_logging.py::test_running_log_using_fd
+ )
+ ;;
+ esac
+
+ epytest
+}
+
+pkg_postinst() {
+ optfeature "auto reload on file changes" dev-python/watchfiles
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-28 7:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-24 0:06 [gentoo-commits] repo/gentoo:master commit in: dev-python/uvicorn/, dev-python/uvicorn/files/ Louis Sautier
-- strict thread matches above, loose matches on Subject: below --
2024-02-03 9:17 Michał Górny
2024-09-28 7:42 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox