From 71f3ae85bd4e8c1718f33f071afa2b3e23936602 Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Sep 10 2021 13:02:31 +0000 Subject: [PATCH 1/2] Update to 0.14.0 --- diff --git a/0001-Up-wsproto-to-1.0.0.patch b/0001-Up-wsproto-to-1.0.0.patch deleted file mode 100644 index 3dae717..0000000 --- a/0001-Up-wsproto-to-1.0.0.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 737d25423ca6c865424598dd77c760b4c807b034 Mon Sep 17 00:00:00 2001 -From: euri10 -Date: Sun, 13 Dec 2020 14:24:12 +0100 -Subject: [PATCH] Up wsproto to 1.0.0 - ---- - requirements.txt | 2 +- - tests/protocols/test_http.py | 1 + - tests/protocols/test_websocket.py | 6 +++++- - 3 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/requirements.txt b/requirements.txt -index a739e05..bcc6b7d 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,7 +1,7 @@ - -e .[standard] - - # Explicit optionals --wsproto==0.15.* -+wsproto==1.0.* - - # Packaging - twine -diff --git a/tests/protocols/test_http.py b/tests/protocols/test_http.py -index f35a965..25110fc 100644 ---- a/tests/protocols/test_http.py -+++ b/tests/protocols/test_http.py -@@ -67,6 +67,7 @@ UPGRADE_REQUEST = b"\r\n".join( - 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 24bc285..7c3fcc0 100644 ---- a/tests/protocols/test_websocket.py -+++ b/tests/protocols/test_websocket.py -@@ -51,7 +51,11 @@ async def test_invalid_upgrade(protocol_cls): - 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: --- -2.29.2 - diff --git a/python-uvicorn.spec b/python-uvicorn.spec index 95d74d2..06c1d95 100644 --- a/python-uvicorn.spec +++ b/python-uvicorn.spec @@ -19,15 +19,13 @@ HTTP/1.1 and WebSockets. Support for HTTP/2 is planned.} Name: python-%{pkgname} -Version: 0.13.4 -Release: 3%{?dist} +Version: 0.14.0 +Release: 1%{?dist} Summary: The lightning-fast ASGI server License: BSD URL: https://www.uvicorn.org # PyPI tarball doesn't have tests Source0: https://github.com/encode/uvicorn/archive/%{version}/%{srcname}-%{version}.tar.gz -# https://github.com/encode/uvicorn/pull/892 -Patch0: 0001-Up-wsproto-to-1.0.0.patch BuildArch: noarch @@ -41,7 +39,7 @@ BuildRequires: %{py3_dist setuptools} %if %{with tests} BuildRequires: %{py3_dist pytest pytest-mock requests trustme httpx pytest-asyncio} # from minimal requirements -BuildRequires: %{py3_dist click h11} +BuildRequires: %{py3_dist asgiref click h11} # from extra requirements BuildRequires: %{py3_dist websockets wsproto httptools uvloop watchgod python-dotenv pyyaml} %endif @@ -82,6 +80,10 @@ rm -rf %{eggname}.egg-info %changelog +* Fri Jul 23 2021 Lumír Balhar - 0.14.0-1 +- Update to 0.14.0 +Resolves: rhbz#1966531 + * Fri Jul 23 2021 Fedora Release Engineering - 0.13.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c4fa46d..b2432e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uvicorn-0.13.4.tar.gz) = 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7 +SHA512 (uvicorn-0.14.0.tar.gz) = f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f From fdc4b0662b7b7e3ad1957e74532f3dc89eb707df Mon Sep 17 00:00:00 2001 From: Tomáš Hrnčiar Date: Sep 10 2021 13:03:47 +0000 Subject: [PATCH 2/2] Update to 0.15.0 --- diff --git a/python-uvicorn.spec b/python-uvicorn.spec index 06c1d95..1089d89 100644 --- a/python-uvicorn.spec +++ b/python-uvicorn.spec @@ -19,7 +19,7 @@ HTTP/1.1 and WebSockets. Support for HTTP/2 is planned.} Name: python-%{pkgname} -Version: 0.14.0 +Version: 0.15.0 Release: 1%{?dist} Summary: The lightning-fast ASGI server License: BSD @@ -80,9 +80,15 @@ rm -rf %{eggname}.egg-info %changelog +* Fri Sep 10 2021 Tomas Hrnciar - 0.15.0-1 +- Update to 0.15.0 +- Fixes: rhbz#1966531 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.13.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jul 23 2021 Lumír Balhar - 0.14.0-1 - Update to 0.14.0 -Resolves: rhbz#1966531 * Fri Jul 23 2021 Fedora Release Engineering - 0.13.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b2432e1..728273c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uvicorn-0.14.0.tar.gz) = f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f +SHA512 (uvicorn-0.15.0.tar.gz) = cbae18392f6e33479cfacda84e4fb3b5322aedaad872ba1a3b02a7d65d4a6c9bc9ba434e9a8d8caf6dfce32629aed14df17882fc5241410707ae861067e7c51b