From 0514652bc1e6ef043dd381cdea6cdce0b7eac16d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 28 Feb 2021 23:19:08 +0100
Subject: [PATCH 1/5] python3Packages.httpx: 0.16.1 -> 0.17.0

---
 pkgs/development/python-modules/httpx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/httpx/default.nix b/pkgs/development/python-modules/httpx/default.nix
index 6e81cc92193c..9fe636c3591b 100644
--- a/pkgs/development/python-modules/httpx/default.nix
+++ b/pkgs/development/python-modules/httpx/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "httpx";
-  version = "0.16.1";
+  version = "0.17.0";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "00gmq45fckcqkj910bvd7pyqz1mvgsdvz4s0k7dzbnc5czzq1f4a";
+    sha256 = "sha256-pRdhPAxKZOVbRhOm4881Dn+IRtpX5T3oFuYdtWp3cgY=";
   };
 
   propagatedBuildInputs = [

From 39cc74dbd84afd1d6caf4c03b4a9cd2c5bf6e3c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 28 Feb 2021 23:41:25 +0100
Subject: [PATCH 2/5] python3Packages.elmax: 0.1.0 -> 0.1.1

---
 pkgs/development/python-modules/elmax/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix
index 4abd06303bc8..7ec3b8d1c112 100644
--- a/pkgs/development/python-modules/elmax/default.nix
+++ b/pkgs/development/python-modules/elmax/default.nix
@@ -9,15 +9,15 @@
 
 buildPythonPackage rec {
   pname = "elmax";
-  version = "0.1.0";
+  version = "0.1.1";
   format = "pyproject";
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "home-assistant-ecosystem";
     repo = "python-elmax";
     rev = version;
-    sha256 = "0np3ixw8khrzb7hd8ly8xv349vnas0myfv9s0ahic58r1l9lcwa4";
+    sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 98cd269c3f340dee35832ef1ee3641598db96600 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 28 Feb 2021 23:44:02 +0100
Subject: [PATCH 3/5] home-assistant: allow later httpx releases

---
 pkgs/servers/home-assistant/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index d5f609eed9dc..2ddd4a45323c 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -87,6 +87,7 @@ in with py.pkgs; buildPythonApplication rec {
       --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \
       --replace "awesomeversion==21.2.2" "awesomeversion>=21.2.2" \
       --replace "cryptography==3.2" "cryptography" \
+      --replace "httpx==0.16.1" "httpx>=0.16.1" \
       --replace "pip>=8.0.3,<20.3" "pip" \
       --replace "pytz>=2020.5" "pytz>=2020.4" \
       --replace "pyyaml==5.4.1" "pyyaml" \

From 7bbebc5d6a1f446ed66d039fe7fe6cd6789ae2b4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 1 Mar 2021 10:00:57 +0100
Subject: [PATCH 4/5] python3Packages.pytest-httpx: 0.10.1 -> 0.11.0

---
 pkgs/development/python-modules/pytest-httpx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index d3b6654931be..c74afe7416de 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pytest-httpx";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchPypi {
     inherit version;
     pname = "pytest_httpx";
     extension = "tar.gz";
-    sha256 = "13ld6nnsc3f7i4zl4qm1jh358z0awr6xfk05azwgngmjb7jmcz0a";
+    sha256 = "sha256-koyrYudZfWRYeK4nP9SLGvEd0xlf017FyZ2FN8CV0Ys=";
   };
 
   propagatedBuildInputs = [ httpx pytest ];

From 928cec1a4ed416d4a2d1c0e784c0213eaf408872 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 1 Mar 2021 10:05:23 +0100
Subject: [PATCH 5/5] python3Packages.pytest-httpx: enable tests

---
 .../python-modules/pytest-httpx/default.nix   | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-httpx/default.nix b/pkgs/development/python-modules/pytest-httpx/default.nix
index c74afe7416de..508b7b7781be 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -1,20 +1,33 @@
-{ lib, buildPythonPackage, fetchPypi, httpx, pytest }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, httpx
+, pytest
+, pytest-asyncio
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
   pname = "pytest-httpx";
   version = "0.11.0";
 
-  src = fetchPypi {
-    inherit version;
-    pname = "pytest_httpx";
-    extension = "tar.gz";
-    sha256 = "sha256-koyrYudZfWRYeK4nP9SLGvEd0xlf017FyZ2FN8CV0Ys=";
+  src = fetchFromGitHub {
+    owner = "Colin-b";
+    repo = "pytest_httpx";
+    rev = "v${version}";
+    sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi";
   };
 
-  propagatedBuildInputs = [ httpx pytest ];
+  propagatedBuildInputs = [
+    httpx
+    pytest
+  ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
 
-  # not in pypi tarball
-  doCheck = false;
   pythonImportsCheck = [ "pytest_httpx" ];
 
   meta = with lib; {