From aab004076b943d90e7c72f93141d54aab6778188 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 22 Apr 2021 00:17:47 +0200
Subject: [PATCH 1/9] python3Packages.httpcore: 0.12.3 -> 0.13.0
---
.../python-modules/httpcore/default.nix | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/python-modules/httpcore/default.nix b/pkgs/development/python-modules/httpcore/default.nix
index dbbdf0bb38c0..079b5e71a10f 100644
--- a/pkgs/development/python-modules/httpcore/default.nix
+++ b/pkgs/development/python-modules/httpcore/default.nix
@@ -5,24 +5,25 @@
, h11
, h2
, pproxy
+, pytest-asyncio
+, pytest-trio
, pytestCheckHook
, pytestcov
, sniffio
-, uvicorn
, trustme
-, trio
+, uvicorn
}:
buildPythonPackage rec {
pname = "httpcore";
- version = "0.12.3";
+ version = "0.13.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "09hbjc5wzhrnri5y3idxcq329d7jiaxljc7y6npwv9gh9saln109";
+ sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
};
propagatedBuildInputs = [
@@ -33,18 +34,19 @@ buildPythonPackage rec {
checkInputs = [
pproxy
+ pytest-asyncio
+ pytest-trio
pytestCheckHook
pytestcov
- uvicorn
trustme
- trio
+ uvicorn
];
- pytestFlagsArray = [
+ disabledTestPaths = [
# these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
- "--ignore=tests/test_threadsafety.py"
- "--ignore=tests/sync_tests/test_interfaces.py"
- "--ignore=tests/sync_tests/test_retries.py"
+ "tests/test_threadsafety.py"
+ "tests/sync_tests/test_interfaces.py"
+ "tests/sync_tests/test_retries.py"
];
pythonImportsCheck = [ "httpcore" ];
From 4100bb837a88a59bcc29b9e95fc905035d462b91 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Apr 2021 16:54:38 +0200
Subject: [PATCH 2/9] python3Packages.httpx: 0.17.1 -> 0.18.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 2aba203ea01f..b45c3e85f502 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.17.1";
+ version = "0.18.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "encode";
repo = pname;
rev = version;
- sha256 = "sha256-P4Uki+vlAgVECBUz9UGvv1ip49jmf0kYbyU2/mkWE3U=";
+ sha256 = "sha256-6EYBTRXaVHBgW/JzZvWLz55AqgocOyym2FVtu2Nkp/U=";
};
propagatedBuildInputs = [
From 8456c41c67e39bb5c59bf602d6e61e01bb61a22d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Apr 2021 17:52:20 +0200
Subject: [PATCH 3/9] python3Packages.elmax: 0.1.1 -> 0.1.2
---
pkgs/development/python-modules/elmax/default.nix | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/python-modules/elmax/default.nix b/pkgs/development/python-modules/elmax/default.nix
index 7ec3b8d1c112..775050acb0c9 100644
--- a/pkgs/development/python-modules/elmax/default.nix
+++ b/pkgs/development/python-modules/elmax/default.nix
@@ -4,12 +4,15 @@
, httpx
, poetry-core
, pythonOlder
+, pytest-asyncio
+, pytest-httpx
+, pytestCheckHook
, yarl
}:
buildPythonPackage rec {
pname = "elmax";
- version = "0.1.1";
+ version = "0.1.2";
format = "pyproject";
disabled = pythonOlder "3.7";
@@ -17,7 +20,7 @@ buildPythonPackage rec {
owner = "home-assistant-ecosystem";
repo = "python-elmax";
rev = version;
- sha256 = "sha256-vDISJ/CVOjpM+GPF2TCm3/AMFTWTM0b/+ZPCpAEvNvY=";
+ sha256 = "sha256-Aq/OHxOmtUUmBNlFPu892C8AkTX+Ee0oca7D79InPXQ=";
};
nativeBuildInputs = [ poetry-core ];
@@ -27,8 +30,12 @@ buildPythonPackage rec {
yarl
];
- # Project has no tests
- doCheck = false;
+ checkInputs = [
+ pytest-asyncio
+ pytest-httpx
+ pytestCheckHook
+ ];
+
pythonImportsCheck = [ "elmax" ];
meta = with lib; {
From 2abb528ac509c0c021d0ef83e0c99c6be89f276d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Apr 2021 18:10:08 +0200
Subject: [PATCH 4/9] python3Packages.aniso8601: 8.1.1 -> 9.0.1
---
.../python-modules/aniso8601/default.nix | 39 ++++++++++++-------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/pkgs/development/python-modules/aniso8601/default.nix b/pkgs/development/python-modules/aniso8601/default.nix
index f28668a8912b..9cc3fb827755 100644
--- a/pkgs/development/python-modules/aniso8601/default.nix
+++ b/pkgs/development/python-modules/aniso8601/default.nix
@@ -1,22 +1,35 @@
-{ lib, buildPythonPackage, fetchPypi
-, dateutil, mock, isPy3k }:
+{ lib
+, buildPythonPackage
+, dateutil
+, fetchPypi
+, isPy3k
+, mock
+, pytestCheckHook
+}:
buildPythonPackage rec {
pname = "aniso8601";
version = "9.0.1";
- meta = with lib; {
- description = "Parses ISO 8601 strings.";
- homepage = "https://bitbucket.org/nielsenb/aniso8601";
- license = licenses.bsd3;
- };
-
- propagatedBuildInputs = [ dateutil ];
-
- checkInputs = lib.optional (!isPy3k) mock;
-
src = fetchPypi {
inherit pname version;
- sha256 = "72e3117667eedf66951bb2d93f4296a56b94b078a8a95905a052611fb3f1b973";
+ sha256 = "sha256-cuMRdmfu32aVG7LZP0KWpWuUsHioqVkFoFJhH7PxuXM=";
+ };
+
+ propagatedBuildInputs = [
+ dateutil
+ ];
+
+ checkInputs = [
+ pytestCheckHook
+ ] ++ lib.optional (!isPy3k) mock;
+
+ pythonImportsCheck = [ "aniso8601" ];
+
+ meta = with lib; {
+ description = "Python Parser for ISO 8601 strings";
+ homepage = "https://bitbucket.org/nielsenb/aniso8601";
+ license = with licenses; [ bsd3 ];
+ maintainers = with maintainers; [ fab ];
};
}
From 0441e9c9d4008a6ca3ee11fbda36ad239d975169 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Apr 2021 23:43:07 +0200
Subject: [PATCH 5/9] python3Packages.respx: 0.16.3 -> 0.17.0
---
pkgs/development/python-modules/respx/default.nix | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pkgs/development/python-modules/respx/default.nix b/pkgs/development/python-modules/respx/default.nix
index 68da058194bf..0a3fa27a8086 100644
--- a/pkgs/development/python-modules/respx/default.nix
+++ b/pkgs/development/python-modules/respx/default.nix
@@ -11,13 +11,13 @@
buildPythonPackage rec {
pname = "respx";
- version = "0.16.3";
+ version = "0.17.0";
src = fetchFromGitHub {
owner = "lundberg";
repo = pname;
rev = version;
- sha256 = "0if9sg83rznl37hsjw6pfk78jpxi421g9p21wd92jcd6073g4nbd";
+ sha256 = "sha256-unGAIsslGXOUHXr0FKzC9bX6+Q3mNGZ9Z/dtjz0gkj4=";
};
# Coverage is under 100 % due to the excluded tests
From e2a49ceaaba26d02ea37737d2cbcf72bfd790a83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Apr 2021 23:47:46 +0200
Subject: [PATCH 6/9] python3Packages.pytest-httpx: 0.11.0 -> 0.12.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 d6f30486f9b2..1773a4b57928 100644
--- a/pkgs/development/python-modules/pytest-httpx/default.nix
+++ b/pkgs/development/python-modules/pytest-httpx/default.nix
@@ -9,13 +9,13 @@
buildPythonPackage rec {
pname = "pytest-httpx";
- version = "0.11.0";
+ version = "0.12.0";
src = fetchFromGitHub {
owner = "Colin-b";
repo = "pytest_httpx";
rev = "v${version}";
- sha256 = "08idd3y6khxjqkn46diqvkjvsl4w4pxhl6z1hspbkrj0pqwf9isi";
+ sha256 = "sha256-Awhsm8jmoCZTBnfrrauLxAEKtpxTzjPMXmx7HR0f/g4=";
};
buildInputs = [ pytest ];
From 5e03f19981c914f829f82025bfdc232fd53d5408 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 28 Apr 2021 13:11:59 +0200
Subject: [PATCH 7/9] python3Packages.aiobotocore: 1.2.2 -> 1.3.0
---
.../development/python-modules/aiobotocore/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/development/python-modules/aiobotocore/default.nix b/pkgs/development/python-modules/aiobotocore/default.nix
index f75a0d6bb60b..1ebf66a2597f 100644
--- a/pkgs/development/python-modules/aiobotocore/default.nix
+++ b/pkgs/development/python-modules/aiobotocore/default.nix
@@ -10,18 +10,18 @@
buildPythonPackage rec {
pname = "aiobotocore";
- version = "1.2.2";
+ version = "1.3.0";
disabled = pythonOlder "3.7";
src = fetchPypi {
inherit pname version;
- sha256 = "37c23166603a3bd134e5f6fc22dbbf8c274d4d24c71418fba292ed2cd7a0bf43";
+ sha256 = "17pcdi69bwdfw2wv3a0fhira5gimw88sp2wf47yqz50z1ckhv2c1";
};
# relax version constraints: aiobotocore works with newer botocore versions
# the pinning used to match some `extras_require` we're not using.
- preConfigure = ''
- substituteInPlace setup.py --replace 'botocore>=1.17.44,<1.17.45' 'botocore'
+ postPatch = ''
+ substituteInPlace setup.py --replace 'botocore>=1.20.49,<1.20.50' 'botocore'
'';
propagatedBuildInputs = [ wrapt aiohttp aioitertools botocore ];
@@ -31,7 +31,7 @@ buildPythonPackage rec {
pythonImportsCheck = [ "aiobotocore" ];
meta = with lib; {
- description = "Async client for amazon services using botocore and aiohttp/asyncio.";
+ description = "Python client for amazon services";
license = licenses.asl20;
homepage = "https://github.com/aio-libs/aiobotocore";
maintainers = with maintainers; [ teh ];
From db374382601a6f6fa87b28c21dabefe24cbe3ea0 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 May 2021 22:52:15 +0200
Subject: [PATCH 8/9] python3Packages.sanic-testing: relax httpcore, httpx pins
---
pkgs/development/python-modules/sanic-testing/default.nix | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/pkgs/development/python-modules/sanic-testing/default.nix b/pkgs/development/python-modules/sanic-testing/default.nix
index fa1dfc6870b5..e5194e36bd23 100644
--- a/pkgs/development/python-modules/sanic-testing/default.nix
+++ b/pkgs/development/python-modules/sanic-testing/default.nix
@@ -20,6 +20,12 @@ buildPythonPackage rec {
hash = "sha256-hBAq+/BKs0a01M89Nb8HaClqxB+W5PTfjVzef/m9SWs=";
};
+ postPatch = ''
+ substituteInPlace setup.py \
+ --replace 'httpx>=0.16, <0.18' 'httpx' \
+ --replace 'httpcore==0.12.*' 'httpcore'
+ '';
+
propagatedBuildInputs = [ httpx sanic websockets httpcore ];
# `sanic` is explicitly set to null when building `sanic` itself
From 47235d6d1afd9159921bd4b830e73c9c29ff6075 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 May 2021 23:23:21 +0200
Subject: [PATCH 9/9] python3Packages.PyRMVTransport: disable failing test
https://github.com/Colin-b/pytest_httpx/issues/40#issuecomment-832116903
---
pkgs/development/python-modules/PyRMVtransport/default.nix | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/pkgs/development/python-modules/PyRMVtransport/default.nix b/pkgs/development/python-modules/PyRMVtransport/default.nix
index cfbf3be1c40c..4079feb93ec3 100644
--- a/pkgs/development/python-modules/PyRMVtransport/default.nix
+++ b/pkgs/development/python-modules/PyRMVtransport/default.nix
@@ -42,6 +42,11 @@ buildPythonPackage rec {
pytest-httpx
];
+ disabledTests = [
+ # fails with pytest-httpx>=0.12.0
+ "test__query_rmv_api_fail"
+ ];
+
meta = with lib; {
homepage = "https://github.com/cgtobi/PyRMVtransport";
description = "Get transport information from opendata.rmv.de";