From daebef59d6a232e813eadb59bbd26a74a1221c23 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Sep 2019 12:50:47 +0100 Subject: [PATCH 1/2] pythonPackages.colorcet: fix & enable all tests on darwin dotfile is simply in a different place on macos --- pkgs/development/python-modules/colorcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorcet/default.nix b/pkgs/development/python-modules/colorcet/default.nix index f92f8004ac0..b877c4cabd5 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; { From 5e0ec5a7533730ff748ca9545c6b7746cf156a93 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 7 Sep 2019 12:53:22 +0100 Subject: [PATCH 2/2] pythonPackages.pytest-mpl: fix & enable tests on darwin dotfile is simply in a different place on macos --- pkgs/development/python-modules/pytest-mpl/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytest-mpl/default.nix b/pkgs/development/python-modules/pytest-mpl/default.nix index 37ba58977e1..edf0450366c 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 '';