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

Merge pull request #60948 from risicle/ris-cartopy-fix

Browse Source 
pythonPackages.cartopy: fix tests for python2.7 using xvfb
This commit is contained in:
worldofpeace 2019-05-07 15:38:11 -04:00 committed by GitHub
commit d61543ad0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,9 @@
{ buildPythonPackage, lib, fetchPypi { buildPythonPackage, lib, fetchPypi
, pytest, filelock, mock, pep8 , pytest, filelock, mock, pep8
, cython, isPy37, glibcLocales , cython, isPy27, isPy37, glibcLocales
, six, pyshp, shapely, geos, proj, numpy , six, pyshp, shapely, geos, proj, numpy
, gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona , gdal, pillow, matplotlib, pyepsg, pykdtree, scipy, owslib, fiona
, xvfb_run
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -17,10 +18,14 @@ buildPythonPackage rec {
checkInputs = [ filelock mock pytest pep8 ]; checkInputs = [ filelock mock pytest pep8 ];
# several tests require network connectivity: we disable them # several tests require network connectivity: we disable them.
checkPhase = '' # also py2.7's tk is over-eager in trying to open an x display,
# so give it xvfb
checkPhase = let
maybeXvfbRun = lib.optionalString isPy27 "${xvfb_run}/bin/xvfb-run";
in ''
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
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"
''; '';