diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-30 12:26:35 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2017-12-31 11:01:52 +0100 |
commit | fd0b0190075552cbffca5386038b6fac8c1880bd (patch) | |
tree | 1e40901882c6796964efaf2848665fa4c1a63357 /pkgs/development/python-modules/pytest | |
parent | 6801d20ac790e973c9a093b345d2a02d2bb72833 (diff) | |
download | nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.tar nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.tar.gz nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.tar.bz2 nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.tar.lz nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.tar.xz nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.tar.zst nixpkgs-fd0b0190075552cbffca5386038b6fac8c1880bd.zip |
python: pytest: 3.2.5 -> 3.3.1
Diffstat (limited to 'pkgs/development/python-modules/pytest')
-rw-r--r-- | pkgs/development/python-modules/pytest/3_2.nix | 27 | ||||
-rw-r--r-- | pkgs/development/python-modules/pytest/default.nix | 12 |
2 files changed, 34 insertions, 5 deletions
diff --git a/pkgs/development/python-modules/pytest/3_2.nix b/pkgs/development/python-modules/pytest/3_2.nix new file mode 100644 index 00000000000..d7a0b1bdad3 --- /dev/null +++ b/pkgs/development/python-modules/pytest/3_2.nix @@ -0,0 +1,27 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py +, setuptools_scm, setuptools +}: +buildPythonPackage rec { + version = "3.2.5"; + pname = "pytest"; + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + src = fetchPypi { + inherit pname version; + sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + }; + + checkInputs = [ hypothesis ]; + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ py setuptools ] + ++ (stdenv.lib.optional isPy26 argparse); + + meta = with stdenv.lib; { + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + platforms = platforms.unix; + }; +} \ No newline at end of file diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 8e280b8fd0d..d45fe7deb12 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py -, setuptools_scm, setuptools +{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py +, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k }: buildPythonPackage rec { - version = "3.2.5"; + version = "3.3.1"; pname = "pytest"; preCheck = '' @@ -12,16 +12,18 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "6d5bd4f7113b444c55a3bbb5c738a3dd80d43563d063fc42dcb0aaefbdd78b81"; + sha256 = "cf8436dc59d8695346fcd3ab296de46425ecab00d64096cebe79fb51ecb2eb93"; }; checkInputs = [ hypothesis ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ py setuptools ] + propagatedBuildInputs = [ attrs py setuptools six pluggy ] + ++ (stdenv.lib.optional (!isPy3k) funcsigs) ++ (stdenv.lib.optional isPy26 argparse); meta = with stdenv.lib; { maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; platforms = platforms.unix; + description = "Framework for writing tests"; }; } |