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

Commits on Sep 9, 2020

  1. pythonPackages.jug: fix tests 

    these seem to have switched to pytest tests in 2.0.2

(cherry picked from commit 570dbab)
    @risicle
    risicle committed Sep 9, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    davidtwco David Wood
    GPG key ID: 2592E76C87381FD9
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c6e9ba3 View commit details

  2. Merge pull request #97490 from risicle/ris-jug-fix-r20.09 

    [20.09] pythonPackages.jug: fix tests
    @roberth
    roberth authored Sep 9, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3b50998 View commit details
Showing with 5 additions and 1 deletion.
  1. +5 −1 pkgs/development/python-modules/jug/default.nix
6 changes: 5 additions & 1 deletion pkgs/development/python-modules/jug/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{ stdenv, buildPythonPackage, fetchPypi, fetchpatch
, nose, numpy
, bottle, pyyaml, redis, six
, zlib }:
, zlib
, pytestCheckHook }:

buildPythonPackage rec {
pname = "Jug";
@@ -21,6 +22,9 @@ buildPythonPackage rec {
sha256 = "859a4b4cb26a0010299b189c92cfba626852c97a38e22f3d1b56e4e1d8ad8620";
};

checkInputs = [ pytestCheckHook ];
pythonImportsCheck = [ "jug" ];

meta = with stdenv.lib; {
description = "A Task-Based Parallelization Framework";
license = licenses.mit;