about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/python-modules/httpcore
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2021-06-23 08:16:49 +0000
committerAlyssa Ross <hi@alyssa.is>2021-06-23 08:16:49 +0000
commit4dc730a187d41f9f2dce4fe2680c32dcecb79b93 (patch)
tree67673deb1649dc0a40962e70e6da302d7b6c4bf0 /nixpkgs/pkgs/development/python-modules/httpcore
parent633cab0ecb07627706c6b523e219490f019eaab5 (diff)
parent7e567a3d092b7de69cdf5deaeb8d9526de230916 (diff)
downloadnixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar
nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.gz
nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.bz2
nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.lz
nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.xz
nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.tar.zst
nixlib-4dc730a187d41f9f2dce4fe2680c32dcecb79b93.zip
Merge commit '7e567a3d092b7de69cdf5deaeb8d9526de230916'
# Conflicts:
#	nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/httpcore')
-rw-r--r--nixpkgs/pkgs/development/python-modules/httpcore/default.nix17
1 files changed, 13 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/httpcore/default.nix b/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
index 079b5e71a10f..7781dbe8b319 100644
--- a/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/httpcore/default.nix
@@ -2,31 +2,33 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, anyio
 , h11
 , h2
 , pproxy
 , pytest-asyncio
-, pytest-trio
 , pytestCheckHook
 , pytestcov
 , sniffio
+, trio
 , trustme
 , uvicorn
 }:
 
 buildPythonPackage rec {
   pname = "httpcore";
-  version = "0.13.0";
+  version = "0.13.6";
   disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "encode";
     repo = pname;
     rev = version;
-    sha256 = "sha256-KvqBVQUaF3p2oJz0tt3Bkn2JiKEHqrZ3b6I9f0JK5h8=";
+    sha256 = "sha256-7G7jchOQTgcFSGZfoMPFm0NY9ofg5MM5Xn5lV+W9w8k=";
   };
 
   propagatedBuildInputs = [
+    anyio
     h11
     h2
     sniffio
@@ -35,16 +37,23 @@ buildPythonPackage rec {
   checkInputs = [
     pproxy
     pytest-asyncio
-    pytest-trio
     pytestCheckHook
     pytestcov
+    trio
     trustme
     uvicorn
   ];
 
+  postPatch = ''
+    # The anyio 3.1.0 release is not picked-up proberly
+    substituteInPlace setup.py --replace "anyio==3.*" "anyio"
+  '';
+
+
   disabledTestPaths = [
     # these tests fail during dns lookups: httpcore.ConnectError: [Errno -2] Name or service not known
     "tests/test_threadsafety.py"
+    "tests/async_tests/"
     "tests/sync_tests/test_interfaces.py"
     "tests/sync_tests/test_retries.py"
   ];