Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5f58361017b1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 925501a5d554
Choose a head ref
  • 3 commits
  • 2 files changed
  • 2 contributors

Commits on Sep 7, 2019

  1. pythonPackages.colorcet: fix & enable all tests on darwin 

    dotfile is simply in a different place on macos
    @risicle
    risicle committed Sep 7, 2019
    Copy the full SHA
    daebef5 View commit details

  2. pythonPackages.pytest-mpl: fix & enable tests on darwin 

    dotfile is simply in a different place on macos
    @risicle
    risicle committed Sep 7, 2019
    Copy the full SHA
    5e0ec5a View commit details

  3. Merge pull request #68260 from risicle/ris-colorcet-pytest-mpl-darwin… 

    …-tests

pythonPackages.{colorcet,pytest-mpl}: fix & re-enable all tests on darwin
    @marsam
    marsam authored Sep 7, 2019
    Copy the full SHA
    925501a View commit details
Showing with 3 additions and 5 deletions.
  1. +2 −2 pkgs/development/python-modules/colorcet/default.nix
  2. +1 −3 pkgs/development/python-modules/pytest-mpl/default.nix
4 changes: 2 additions & 2 deletions pkgs/development/python-modules/colorcet/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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; {
4 changes: 1 addition & 3 deletions pkgs/development/python-modules/pytest-mpl/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
'';