JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

python: pytest: 3.4.2 -> 3.5.0

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-04-04 20:15:54 +02:00
parent 55670818b0
commit 2744b4ff28
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
}:
buildPythonPackage rec {
version = "3.4.2";
version = "3.5.0";
pname = "pytest";
preCheck = ''
@ -12,12 +12,12 @@ buildPythonPackage rec {
src = fetchPypi {
inherit pname version;
sha256 = "1idq7s8da2p82ynf9fcg77rzj1dsagg3bpsrlslf31x7q4vasyqi";
sha256 = "fae491d1874f199537fd5872b5e1f0e74a009b979df9d53d1553fd03da1703e1";
};
checkInputs = [ hypothesis ];
buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy ]
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools ]
++ (stdenv.lib.optional (!isPy3k) funcsigs)
++ (stdenv.lib.optional isPy26 argparse);

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

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