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

pythonPackages.cartopy: use proj_5

Browse Source
This commit is contained in:
Jonathan Ringer 2019-07-13 23:02:29 -07:00
parent 1414598875
commit ed8917f831
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,10 @@
{ buildPythonPackage, lib, fetchPypi { buildPythonPackage, lib, fetchPypi
, pytest, filelock, mock, pep8 , pytest, filelock, mock, pep8
, cython, isPy27 , cython, isPy27
, six, pyshp, shapely, geos, proj, numpy , six, pyshp, shapely, geos, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
, xvfb_run , xvfb_run
, proj_5 # see https://github.com/SciTools/cartopy/pull/1252 for status on proj 6 support
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -27,17 +28,17 @@ buildPythonPackage rec {
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
${maybeXvfbRun} pytest --pyargs cartopy \ ${maybeXvfbRun} pytest --pyargs cartopy \
-m "not network and not natural_earth" \ -m "not network and not natural_earth" \
-k "not test_nightshade_image" -k "not test_nightshade_image and not background_img"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
cython cython
geos # for geos-config geos # for geos-config
proj proj_5
]; ];
buildInputs = [ buildInputs = [
geos proj geos proj_5
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [