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: dd9172022c86
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ace12f4e3112
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 13, 2017

  1. skip failing tests on darwin

    @georgewhewell
    georgewhewell committed Feb 13, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    vdemeester Vincent Demeester
    GPG key ID: 083CC6FD6EB699A3
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5af946b View commit details

  2. Merge pull request #21437 from georgewhewell/bugfix/pythonPackages.jo… 

    …blib

pythonPackages.joblib: skip failing test on darwin
    @FRidh
    FRidh authored Feb 13, 2017
    Copy the full SHA
    ace12f4 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/top-level/python-packages.nix
4 changes: 2 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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.