diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2019-09-07 12:09:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-07 12:09:58 -0500 |
| commit | 925501a5d5541bb62e6b24daea1883304b4c3fd2 (patch) | |
| tree | 1e514c218d224f51c05c1f231f5f1618587c24c1 /pkgs/development/python-modules | |
| parent | 5f58361017b1407711f31bc23c91592424417403 (diff) | |
| parent | 5e0ec5a7533730ff748ca9545c6b7746cf156a93 (diff) | |
| download | nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.tar nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.tar.gz nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.tar.bz2 nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.tar.lz nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.tar.xz nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.tar.zst nixlib-925501a5d5541bb62e6b24daea1883304b4c3fd2.zip | |
Merge pull request #68260 from risicle/ris-colorcet-pytest-mpl-darwin-tests
pythonPackages.{colorcet,pytest-mpl}: fix & re-enable all tests on darwinDiffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/colorcet/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pytest-mpl/default.nix | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index f92f8004ac00..b877c4cabd5f 100644 --- a/pkgs/development/python-modules/colorcet/default.nix +++ b/pkgs/development/python-modules/colorcet/default.nix @@ -34,9 +34,9 @@ buildPythonPackage rec { export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + ln -s $HOME/.config/matplotlib $HOME/.matplotlib - # disable matplotlib tests on darwin, because it requires a framework build of Python - pytest ${stdenv.lib.optionalString stdenv.isDarwin "--ignore=colorcet/tests/test_matplotlib.py"} colorcet + pytest colorcet ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 37ba58977e15..edf0450366c5 100644 --- a/pkgs/development/python-modules/pytest-mpl/default.nix +++ b/pkgs/development/python-modules/pytest-mpl/default.nix @@ -26,13 +26,11 @@ buildPythonPackage rec { pytest ]; - # disable tests on darwin, because it requires a framework build of Python - doCheck = !stdenv.isDarwin; - checkPhase = '' export HOME=$(mktemp -d) mkdir -p $HOME/.config/matplotlib echo "backend: ps" > $HOME/.config/matplotlib/matplotlibrc + ln -s $HOME/.config/matplotlib $HOME/.matplotlib pytest ''; |