summary refs log tree commit diff
path: root/pkgs/development/python-modules/treq
diff options
context:
space:
mode:
authorFrederik Rietdijk <freddyrietdijk@fridh.nl>2017-09-05 11:16:41 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2017-09-06 13:54:10 +0200
commit67651d80bc8baaf09ab91fec8ea423e09107ed8f (patch)
tree216a82ca309b80298039c2038160a22e94a1de6f /pkgs/development/python-modules/treq
parent036bafe0b94fb99ee9d1eb3d2fb902293a9f39a6 (diff)
downloadnixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar
nixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.gz
nixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.bz2
nixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.lz
nixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.xz
nixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.tar.zst
nixpkgs-67651d80bc8baaf09ab91fec8ea423e09107ed8f.zip
Merge pull request #28884 from FRidh/python-fixes
Python: several fixes
Diffstat (limited to 'pkgs/development/python-modules/treq')
-rw-r--r--pkgs/development/python-modules/treq/default.nix17
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 5ee984941d0..6bd7355b34d 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchPypi, buildPythonPackage, service-identity, requests, six
-, mock, twisted, incremental, pep8 }:
+, mock, twisted, incremental, pep8, httpbin
+}:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
@@ -11,11 +12,20 @@ buildPythonPackage rec {
     sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16";
   };
 
-  propagatedBuildInputs = [ twisted requests six incremental service-identity ];
+  propagatedBuildInputs = [
+    requests
+    six
+    incremental
+    service-identity
+    twisted
+    # twisted [tls] requirements (we should find a way to list "extras")
+    twisted.extras.tls
+  ];
 
   checkInputs = [
     pep8
     mock
+    httpbin
   ];
 
   postPatch = ''
@@ -35,6 +45,9 @@ buildPythonPackage rec {
     trial treq
   '';
 
+  # Failing tests https://github.com/twisted/treq/issues/208
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = http://github.com/twisted/treq;
     description = "A requests-like API built on top of twisted.web's Agent";