ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-01 01:57:37 +03:00
Code Issues Projects Releases Wiki Activity

python: pytest: 3.2.5 -> 3.3.1

Browse Source
This commit is contained in:
Frederik Rietdijk 2017-12-30 12:26:35 +01:00
parent 6801d20ac7
commit fd0b019007
3 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/development/python-modules/pytest/3_2.nix Normal file
View File

@ -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;
};
}

12
pkgs/development/python-modules/pytest/default.nix
View File

@ -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";
};
}

13
pkgs/top-level/python-packages.nix
View File

@ -3436,7 +3436,7 @@ in {
};
};
pytest = self.pytest_32;
pytest = self.pytest_33;
pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
@ -3451,7 +3451,16 @@ in {
pytest = null;
};
};
pytest_32 = callPackage ../development/python-modules/pytest{
pytest_32 = callPackage ../development/python-modules/pytest/3_2.nix{
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;
pytest = null;
};
};
pytest_33 = callPackage ../development/python-modules/pytest/default.nix{
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;