summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2019-02-25 10:51:42 +0100
committerRobert Schütz <robert.schuetz@stud.uni-heidelberg.de>2019-02-25 11:13:46 +0100
commit865e83b80d5442fc6099b91389165d38a52e2804 (patch)
tree3f808bf7102681e66d1306b0923bc586976bd98f /pkgs
parent18fe630281dd8606326a5e2eed861bf97dfdc179 (diff)
downloadnixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.tar
nixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.tar.gz
nixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.tar.bz2
nixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.tar.lz
nixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.tar.xz
nixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.tar.zst
nixpkgs-865e83b80d5442fc6099b91389165d38a52e2804.zip
python.pkgs.fiona: fix build
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/python-modules/fiona/default.nix30
1 files changed, 21 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index c5505efc168..ff6f0716d71 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, buildPythonPackage, fetchPypi,
-  six, cligj, munch, click-plugins, enum34, pytest, nose,
-  gdal
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+, attrs, click, cligj, click-plugins, six, munch, enum34
+, pytest, boto3
+, gdal
 }:
 
 buildPythonPackage rec {
@@ -14,24 +15,35 @@ buildPythonPackage rec {
 
   CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
 
+  nativeBuildInputs = [
+    gdal # for gdal-config
+  ];
+
   buildInputs = [
     gdal
   ];
 
   propagatedBuildInputs = [
-    six
+    attrs
+    click
     cligj
-    munch
     click-plugins
-    enum34
-  ];
+    six
+    munch
+  ] ++ stdenv.lib.optional (!isPy3k) enum34;
 
   checkInputs = [
     pytest
-    nose
+    boto3
   ];
 
-  doCheck = false;
+  checkPhase = ''
+    rm -r fiona # prevent importing local fiona
+    # Some tests access network, others test packaging
+    pytest -k "not test_*_http \
+           and not test_*_https \
+           and not test_*_wheel"
+  '';
 
   meta = with stdenv.lib; {
     description = "OGR's neat, nimble, no-nonsense API for Python";