diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-02-13 17:54:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 17:54:54 +0100 |
| commit | ace12f4e3112778aba9a2165bb9bc919e83c0599 (patch) | |
| tree | 17ce48b438289c70ee7a6c61a5e067ef19ae8b2b | |
| parent | dd9172022c861dd654ba84341cba03bcd2c0edf6 (diff) | |
| parent | 5af946bd2cd1bb3285b973f31c969f776069a2c7 (diff) | |
| download | nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.tar nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.tar.gz nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.tar.bz2 nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.tar.lz nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.tar.xz nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.tar.zst nixpkgs-ace12f4e3112778aba9a2165bb9bc919e83c0599.zip | |
Merge pull request #21437 from georgewhewell/bugfix/pythonPackages.joblib
pythonPackages.joblib: skip failing test on darwin
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ee8ad5ebd5..c0908484325 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9447,8 +9447,8 @@ in { buildInputs = with self; [ nose sphinx numpydoc ]; - # Failing test on Python 3.x - postPatch = '''' + optionalString isPy3k '' + # Failing test on Python 3.x and Darwin + postPatch = '''' + optionalString (isPy3k || stdenv.isDarwin) '' sed -i -e '70,84d' joblib/test/test_format_stack.py # test_nested_parallel_warnings: ValueError: Non-zero return code: -9. # Not sure why but it's nix-specific. Try removing for new joblib releases. |