colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70671 from jonringer/fix-cartopy

Browse Source 
pythonPackages.cartopy: fix tests
This commit is contained in:
Frederik Rietdijk 2019-10-11 12:00:47 +02:00 committed by GitHub
commit 17fed123a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/python-modules/cartopy/default.nix
View File

@ -1,5 +1,5 @@
{ buildPythonPackage, lib, fetchPypi
, pytest, filelock, mock, pep8
, pytest_4, filelock, mock, pep8
, cython, isPy27
, six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
@ -17,7 +17,7 @@ buildPythonPackage rec {
sha256 = "0q9ckfi37cxj7jwnqnzij62vwcf4krccx576vv5lhvpgvplxjjs2";
};
checkInputs = [ filelock mock pytest pep8 ];
checkInputs = [ filelock mock pytest_4 pep8 ];
# several tests require network connectivity: we disable them.
# also py2.7's tk is over-eager in trying to open an x display,

14
pkgs/development/python-modules/fiona/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
{ stdenv, lib, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
, attrs, click, cligj, click-plugins, six, munch, enum34
, pytest, boto3, mock
, pytest, boto3, mock, giflib
, gdal_2 # can't bump to 3 yet, https://github.com/Toblerity/Fiona/issues/745
}:
@ -13,7 +13,7 @@ buildPythonPackage rec {
sha256 = "10qym4anwh0mgfgkhrz6cimkv7af3rd49290k497icq36bkkn73i";
};
CXXFLAGS = stdenv.lib.optionalString stdenv.cc.isClang "-std=c++11";
CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11";
nativeBuildInputs = [
gdal_2 # for gdal-config
@ -21,7 +21,7 @@ buildPythonPackage rec {
buildInputs = [
gdal_2
];
] ++ lib.optionals stdenv.cc.isClang [ giflib ];
propagatedBuildInputs = [
attrs
@ -30,12 +30,12 @@ buildPythonPackage rec {
click-plugins
six
munch
] ++ stdenv.lib.optional (!isPy3k) enum34;
] ++ lib.optional (!isPy3k) enum34;
checkInputs = [
pytest
boto3
] ++ stdenv.lib.optional (pythonOlder "3.4") mock;
] ++ lib.optional (pythonOlder "3.4") mock;
checkPhase = ''
rm -r fiona # prevent importing local fiona
@ -45,7 +45,7 @@ buildPythonPackage rec {
and not test_*_wheel"
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "OGR's neat, nimble, no-nonsense API for Python";
homepage = http://toblerity.org/fiona/;
license = licenses.bsd3;