Merge remote-tracking branch 'upstream/python-unstable' into HEAD

2017-11-23 16:38:39 +01:00
parent 6ad79678d4 59d82d8895
commit 35f5912db5
14 changed files with 135 additions and 101 deletions
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,10 +1,9 @@
 { stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
-, setuptools_scm
+, setuptools_scm, setuptools
 }:
 buildPythonPackage rec {
  version = "3.2.5";
  pname = "pytest";
-  name = "${pname}-${version}";

  preCheck = ''
    # don't test bash builtins
@@ -16,8 +15,9 @@ buildPythonPackage rec {
    sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81";
  };

-  buildInputs = [ hypothesis setuptools_scm ];
-  propagatedBuildInputs = [ py ]
+  checkInputs = [ hypothesis ];
+  buildInputs = [ setuptools_scm ];
+  propagatedBuildInputs = [ py setuptools ]
    ++ (stdenv.lib.optional isPy26 argparse);

  meta = with stdenv.lib; {