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

Merge pull request #60998 from risicle/ris-worldengine-fix 

pythonPackages.worldengine: fix tests by moving nose to checkInputs
This commit is contained in:
Renaud 2019-05-07 16:16:16 +02:00 committed by GitHub
parent d51e32404c 4a72ca1135
commit acba817161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/worldengine/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, buildPythonPackage , buildPythonPackage
, pythonOlder
, fetchFromGitHub , fetchFromGitHub
, nose , nose
, noise , noise
@ -33,7 +34,6 @@ buildPythonPackage rec {
ln -s ${src-data} worldengine-data ln -s ${src-data} worldengine-data
''; '';
buildInputs = [ nose ];
propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ]; propagatedBuildInputs = [ noise numpy pyplatec protobuf purepng h5py gdal ];
prePatch = '' prePatch = ''
@ -46,9 +46,10 @@ buildPythonPackage rec {
--replace 'PyPlatec==1.4.0' 'PyPlatec' \ --replace 'PyPlatec==1.4.0' 'PyPlatec' \
''; '';
doCheck = true; # with python<3.5, unittest fails to discover tests because of their filenames
# so nose is used instead.
postCheck = '' checkInputs = stdenv.lib.optional (pythonOlder "3.5") [ nose ];
postCheck = stdenv.lib.optionalString (pythonOlder "3.5") ''
nosetests tests nosetests tests
''; '';