From dcb5b9f8b5afb86108910a5d6ffe2e89a8ce3649 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Tue, 27 Apr 2021 23:22:09 -1000
Subject: [PATCH] Bump httpx to 0.18.0 and respx to 0.17.0 (#49805)

---
 homeassistant/package_constraints.txt              | 6 +-----
 requirements.txt                                   | 2 +-
 requirements_test.txt                              | 2 +-
 script/gen_requirements_all.py                     | 4 ----
 setup.py                                           | 2 +-
 tests/components/enphase_envoy/test_config_flow.py | 2 +-
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 5f66fe932ef4..f441ffcbf4af 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -17,7 +17,7 @@ distro==1.5.0
 emoji==1.2.0
 hass-nabucasa==0.43.0
 home-assistant-frontend==20210427.0
-httpx==0.17.1
+httpx==0.18.0
 jinja2>=2.11.3
 netdisco==2.8.2
 paho-mqtt==1.5.1
@@ -44,10 +44,6 @@ urllib3>=1.24.3
 # Constrain H11 to ensure we get a new enough version to support non-rfc line endings
 h11>=0.12.0
 
-# Constrain httpcore to fix exception when connection dropped
-# https://github.com/encode/httpcore/issues/239
-httpcore>=0.12.3
-
 # Constrain httplib2 to protect against GHSA-93xj-8mrv-444m
 # https://github.com/advisories/GHSA-93xj-8mrv-444m
 httplib2>=0.19.0
diff --git a/requirements.txt b/requirements.txt
index a3facbe5ab23..475ece2b8664 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ awesomeversion==21.2.3
 bcrypt==3.1.7
 certifi>=2020.12.5
 ciso8601==2.1.3
-httpx==0.17.1
+httpx==0.18.0
 jinja2>=2.11.3
 PyJWT==1.7.1
 cryptography==3.3.2
diff --git a/requirements_test.txt b/requirements_test.txt
index 4403aedb7cc8..42160b36eb1d 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -23,6 +23,6 @@ pytest-xdist==2.1.0
 pytest==6.2.3
 requests_mock==1.8.0
 responses==0.12.0
-respx==0.16.2
+respx==0.17.0
 stdlib-list==0.7.0
 tqdm==4.49.0
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index ac1e4bc2ed9e..af06542d7448 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -66,10 +66,6 @@ urllib3>=1.24.3
 # Constrain H11 to ensure we get a new enough version to support non-rfc line endings
 h11>=0.12.0
 
-# Constrain httpcore to fix exception when connection dropped
-# https://github.com/encode/httpcore/issues/239
-httpcore>=0.12.3
-
 # Constrain httplib2 to protect against GHSA-93xj-8mrv-444m
 # https://github.com/advisories/GHSA-93xj-8mrv-444m
 httplib2>=0.19.0
diff --git a/setup.py b/setup.py
index f74a913cb81c..4791b0815f1f 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ REQUIRES = [
     "bcrypt==3.1.7",
     "certifi>=2020.12.5",
     "ciso8601==2.1.3",
-    "httpx==0.17.1",
+    "httpx==0.18.0",
     "jinja2>=2.11.3",
     "PyJWT==1.7.1",
     # PyJWT has loose dependency. We want the latest one.
diff --git a/tests/components/enphase_envoy/test_config_flow.py b/tests/components/enphase_envoy/test_config_flow.py
index 45aeecf912ab..a4eb8a574dc0 100644
--- a/tests/components/enphase_envoy/test_config_flow.py
+++ b/tests/components/enphase_envoy/test_config_flow.py
@@ -80,7 +80,7 @@ async def test_form_cannot_connect(hass: HomeAssistant) -> None:
 
     with patch(
         "homeassistant.components.enphase_envoy.config_flow.EnvoyReader.getData",
-        side_effect=httpx.HTTPError("any", request=MagicMock()),
+        side_effect=httpx.HTTPError("any"),
     ):
         result2 = await hass.config_entries.flow.async_configure(
             result["flow_id"],