summary refs log tree commit diff
path: root/pkgs/development/python-modules/flask-restful
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-07-05 18:58:04 +0200
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2018-07-05 18:59:25 +0200
commita04c9e2deb41d8cadcf7789505902d76c2933581 (patch)
treeef1b398ddf61d3dc4c493e6741ce266a8dfac8b6 /pkgs/development/python-modules/flask-restful
parent806e5a3882549522cee542d7038960b96ee04e99 (diff)
downloadnixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.tar
nixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.tar.gz
nixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.tar.bz2
nixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.tar.lz
nixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.tar.xz
nixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.tar.zst
nixpkgs-a04c9e2deb41d8cadcf7789505902d76c2933581.zip
python.pkgs.flask-restful: fix tests
Fixes #43001.
Diffstat (limited to 'pkgs/development/python-modules/flask-restful')
-rw-r--r--pkgs/development/python-modules/flask-restful/default.nix28
1 files changed, 18 insertions, 10 deletions
diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index a57823a0987..41735c4d1c6 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k
 , nose, mock, blinker
 , flask, six, pytz, aniso8601, pycrypto
 }:
@@ -12,19 +12,27 @@ buildPythonPackage rec {
     sha256 = "01rlvl2iq074ciyn4schmjip7cyplkwkysbb8f610zil06am35ap";
   };
 
-# TypeError: Only byte strings can be passed to C code
-  patchPhase = if isPy3k then ''
+  patches = [
+    (fetchpatch {
+      url = https://github.com/flask-restful/flask-restful/commit/54979f0a49b2217babc53c5b65b5df10b6de8e05.patch;
+      sha256 = "11s6ag6l42g61ccg5jw9j1f26hwgjfa3sp890cbl5r4hy5ycpyr5";
+    })
+    (fetchpatch {
+      url = https://github.com/flask-restful/flask-restful/commit/f45e81a45ed03922fd225afe27006315811077e6.patch;
+      sha256 = "16avd369j5r08d1l23mwbba26zjwnmfqvfvnfz02am3gr5l6p3gl";
+    })
+  ];
+
+  postPatch = lib.optionalString isPy3k ''
+    # TypeError: Only byte strings can be passed to C code
     rm tests/test_crypto.py tests/test_paging.py
-    '' else null;
-# Disable test broken with aniso > 3.0.0, can be removed when updating to a flask-restful version with commit 54979f0
-  preCheck = ''
-  substituteInPlace "./tests/test_inputs.py" --replace "test_bad_isointervals" "disabled_bad_isointervals"
   '';
-  buildInputs = [ nose mock blinker ];
+
+  checkInputs = [ nose mock blinker ];
+
   propagatedBuildInputs = [ flask six pytz aniso8601 pycrypto ];
-  PYTHON_EGG_CACHE = "`pwd`/.egg-cache";
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "http://flask-restful.readthedocs.io/";
     description = "REST API building blocks for Flask";
     license = licenses.bsd3;