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

python: pytest: 3.6.3 -> 3.7.1

Browse Source
This commit is contained in:
Frederik Rietdijk 2018-08-13 09:31:19 +02:00
parent f1dba212e7
commit 974d04eec6
2 changed files with 7 additions and 7 deletions
pkgs
development/python-modules/pytest
default.nix
top-level
python-packages.nix

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

@ -1,9 +1,9 @@
{ stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py { stdenv, buildPythonPackage, fetchPypi, attrs, hypothesis, py
, setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools
, atomicwrites, mock, writeText , atomicwrites, mock, writeText, pathlib2
}: }:
buildPythonPackage rec { buildPythonPackage rec {
version = "3.6.3"; version = "3.7.1";
pname = "pytest"; pname = "pytest";
preCheck = '' preCheck = ''
@ -13,13 +13,13 @@ buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "0453c8676c2bee6feb0434748b068d5510273a916295fd61d306c4f22fbfd752"; sha256 = "86a8dbf407e437351cef4dba46736e9c5a6e3c3ac71b2e942209748e76ff2086";
}; };
checkInputs = [ hypothesis mock ]; checkInputs = [ hypothesis mock ];
buildInputs = [ setuptools_scm ]; buildInputs = [ setuptools_scm ];
propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites]
++ (stdenv.lib.optional (!isPy3k) funcsigs); ++ stdenv.lib.optionals (!isPy3k) [ funcsigs pathlib2 ];
checkPhase = '' checkPhase = ''
runHook preCheck runHook preCheck

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

@ -1832,15 +1832,15 @@ in {
}; };
}; };
pytest = self.pytest_36; pytest = self.pytest_37;
pytest_36 = callPackage ../development/python-modules/pytest { pytest_37 = callPackage ../development/python-modules/pytest {
# hypothesis tests require pytest that causes dependency cycle # hypothesis tests require pytest that causes dependency cycle
hypothesis = self.hypothesis.override { doCheck = false; }; hypothesis = self.hypothesis.override { doCheck = false; };
}; };
# Needed for celery # Needed for celery
pytest_32 = self.pytest_36.overridePythonAttrs( oldAttrs: rec { pytest_32 = self.pytest_37.overridePythonAttrs( oldAttrs: rec {
version = "3.2.5"; version = "3.2.5";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version; inherit version;