diff --git a/newer-httpcore.patch b/newer-httpcore.patch deleted file mode 100644 index 3ec62d1..0000000 --- a/newer-httpcore.patch +++ /dev/null @@ -1,91 +0,0 @@ -From aff5a9327f393379f2ef87acad0b0fc6ddee608f Mon Sep 17 00:00:00 2001 -From: Paul Schreiber -Date: Mon, 9 Oct 2023 16:04:17 -0400 -Subject: [PATCH 1/4] Support newer versions of httpcore - -httpcore 1.0.0 was release October 6, 2023. ---- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index baa92e9a43..ef4d02b12d 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -29,7 +29,7 @@ classifiers = [ - ] - dependencies = [ - "certifi", -- "httpcore>=0.18.0,<0.19.0", -+ "httpcore", - "idna", - "sniffio", - ] - -From 4b0f70d2d56075b84b7abdf3111f0bb11064b9fc Mon Sep 17 00:00:00 2001 -From: Tom Christie -Date: Wed, 11 Oct 2023 12:18:52 +0100 -Subject: [PATCH 2/4] Update pyproject.toml - ---- - pyproject.toml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pyproject.toml b/pyproject.toml -index ef4d02b12d..f1e2d78f94 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,6 +30,7 @@ classifiers = [ - dependencies = [ - "certifi", - "httpcore", -+ "anyio", - "idna", - "sniffio", - ] - -From aa7a02ab0cdf22489b3fe5b48e4253c5533b9dfd Mon Sep 17 00:00:00 2001 -From: Paul Schreiber -Date: Wed, 11 Oct 2023 09:59:45 -0400 -Subject: [PATCH 3/4] Update pyproject.toml - -Co-authored-by: Kar Petrosyan <92274156+karpetrosyan@users.noreply.github.com> ---- - pyproject.toml | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/pyproject.toml b/pyproject.toml -index f1e2d78f94..ef4d02b12d 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,7 +30,6 @@ classifiers = [ - dependencies = [ - "certifi", - "httpcore", -- "anyio", - "idna", - "sniffio", - ] - -From 4215d27bcdf934e64ad223b7945806f6104edc90 Mon Sep 17 00:00:00 2001 -From: Paul Schreiber -Date: Thu, 19 Oct 2023 10:40:57 -0400 -Subject: [PATCH 4/4] Update pyproject.toml - -Co-authored-by: Tom Christie ---- - pyproject.toml | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pyproject.toml b/pyproject.toml -index ef4d02b12d..f1e2d78f94 100644 ---- a/pyproject.toml -+++ b/pyproject.toml -@@ -30,6 +30,7 @@ classifiers = [ - dependencies = [ - "certifi", - "httpcore", -+ "anyio", - "idna", - "sniffio", - ] diff --git a/python-httpx.changes b/python-httpx.changes index a5ca74c..8316089 100644 --- a/python-httpx.changes +++ b/python-httpx.changes @@ -7,6 +7,7 @@ Mon Nov 27 15:50:38 UTC 2023 - Dirk Müller * Add support for httpcore 1.0 (#2885) * Raise `ValueError` on `Response.encoding` being set after `Response.text` has been accessed. (#2852) +- drop newer-httpcore.patch (upstream) ------------------------------------------------------------------- Tue Oct 31 10:55:34 UTC 2023 - Markéta Machová diff --git a/python-httpx.spec b/python-httpx.spec index 5d30d12..5b13318 100644 --- a/python-httpx.spec +++ b/python-httpx.spec @@ -33,8 +33,6 @@ Summary: Python HTTP client with async support License: BSD-3-Clause URL: https://github.com/encode/httpx Source: https://github.com/encode/httpx/archive/%{version}.tar.gz#/httpx-%{version}.tar.gz -# PATCH-FIX-UPSTREAM https://github.com/encode/httpx/pull/2885 Support newer versions of httpcore -Patch: newer-httpcore.patch BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module hatch-fancy-pypi-readme} BuildRequires: %{python_module hatchling} @@ -80,8 +78,6 @@ Python HTTP client with async support. %prep %autosetup -p1 -n httpx-%{version} -# remove turning pytest warnings into error -#sed -i '/tool.pytest/,$ {/error/d}' setup.cfg %build %pyproject_wheel