diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2019-07-13 23:02:29 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2019-07-14 09:59:30 -0700 |
| commit | ed8917f83161d2793cd7cd27f0dc5485b4c7a215 (patch) | |
| tree | f524060d7dab75f5957bf147cf82b7efa081e3b4 /pkgs | |
| parent | 141459887557649e43886ae81bd9b78b10842169 (diff) | |
| download | nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.tar nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.tar.gz nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.tar.bz2 nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.tar.lz nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.tar.xz nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.tar.zst nixlib-ed8917f83161d2793cd7cd27f0dc5485b4c7a215.zip | |
pythonPackages.cartopy: use proj_5
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/cartopy/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/cartopy/default.nix b/pkgs/development/python-modules/cartopy/default.nix index e54136a50276..117b6fed5971 100644 --- a/pkgs/development/python-modules/cartopy/default.nix +++ b/pkgs/development/python-modules/cartopy/default.nix @@ -1,9 +1,10 @@ { buildPythonPackage, lib, fetchPypi , pytest, filelock, mock, pep8 , cython, isPy27 -, six, pyshp, shapely, geos, proj, numpy +, six, pyshp, shapely, geos, numpy , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , xvfb_run +, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support }: buildPythonPackage rec { @@ -27,17 +28,17 @@ buildPythonPackage rec { export HOME=$(mktemp -d) ${maybeXvfbRun} pytest --pyargs cartopy \ -m "not network and not natural_earth" \ - -k "not test_nightshade_image" + -k "not test_nightshade_image and not background_img" ''; nativeBuildInputs = [ cython geos # for geos-config - proj + proj_5 ]; buildInputs = [ - geos proj + geos proj_5 ]; propagatedBuildInputs = [ |