BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python: pytest: 3.5.1 -> 3.6.1

Browse source
This commit is contained in:
Frederik Rietdijk 2018-06-12 18:47:06 +02:00
parent 74f2bc3eb2
commit c08d570350
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/python-modules/pytest/default.nix
View file

@ -1,8 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites
}:
buildPythonPackage rec {
version = "3.5.1";
version = "3.6.1";
pname = "pytest";
preCheck = ''
@ -12,15 +13,21 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "54713b26c97538db6ff0703a12b19aeaeb60b5e599de542e7fca0ec83b9038e8";
sha256 = "32c49a69566aa7c333188149ad48b58ac11a426d5352ea3d8f6ce843f88199cb";
};
checkInputs = [ hypothesis ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ]
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
++ (stdenv.lib.optional (!isPy3k) funcsigs)
++ (stdenv.lib.optional isPy26 argparse);
checkPhase = ''
runHook preCheck
$out/bin/py.test -x testing/
runHook postCheck
'';
meta = with stdenv.lib; {
maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
platforms = platforms.unix;

6
pkgs/top-level/python-packages.nix
View file

@ -1925,9 +1925,9 @@ in {
};
};
pytest = self.pytest_35;
pytest = self.pytest_36;
pytest_35 = callPackage ../development/python-modules/pytest {
pytest_36 = callPackage ../development/python-modules/pytest {
hypothesis = self.hypothesis.override {
# hypothesis requires pytest that causes dependency cycle
doCheck = false;
@ -1936,7 +1936,7 @@ in {
};
# Needed for celery
pytest_32 = self.pytest_35.overrideAttrs( oldAttrs: rec {
pytest_32 = self.pytest_36.overrideAttrs( oldAttrs: rec {
version = "3.2.5";
src = oldAttrs.src.override {
inherit version;