diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2019-05-24 20:02:00 -0500 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-06-18 11:11:16 +0200 |
commit | 1a7ffb4140b8fff7a0a23d261be17533fa97d978 (patch) | |
tree | aa3a019bd41d5afad218fc4179683a83421090fc | |
parent | 96a662161c397245ff5f244e0c4d2e59e1c32caf (diff) | |
download | nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.tar nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.tar.gz nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.tar.bz2 nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.tar.lz nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.tar.xz nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.tar.zst nixlib-1a7ffb4140b8fff7a0a23d261be17533fa97d978.zip |
pythonPackages.pytest: 4.2.1 -> 4.6.3
-rw-r--r-- | pkgs/development/python-modules/pytest/default.nix | 8 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 45572938496c..c74d59fd9925 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -1,9 +1,9 @@ { stdenv, buildPythonPackage, pythonOlder, fetchPypi, attrs, hypothesis, py , setuptools_scm, setuptools, six, pluggy, funcsigs, isPy3k, more-itertools -, atomicwrites, mock, writeText, pathlib2 +, atomicwrites, mock, writeText, pathlib2, wcwidth, packaging }: buildPythonPackage rec { - version = "4.2.1"; + version = "4.6.3"; pname = "pytest"; preCheck = '' @@ -13,12 +13,12 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c2396a15726218a2dfef480861c4ba37bd3952ebaaa5b0fede3fc23fddcd7f8c"; + sha256 = "4a784f1d4f2ef198fe9b7aef793e9fa1a3b2f84e822d9b3a64a181293a572d45"; }; checkInputs = [ hypothesis mock ]; buildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites] + propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] ++ stdenv.lib.optionals (!isPy3k) [ funcsigs ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1c442226c1dc..114b926b89e7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1688,9 +1688,9 @@ in { pyhepmc = callPackage ../development/python-modules/pyhepmc { }; - pytest = self.pytest_42; + pytest = self.pytest_4; - pytest_42 = callPackage ../development/python-modules/pytest { + pytest_4 = callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle hypothesis = self.hypothesis.override { doCheck = false; }; }; |