From 2744b4ff28a4cd322e7cc8dec0421bd2e1ea0ac9 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 4 Apr 2018 20:15:54 +0200 Subject: [PATCH] python: pytest: 3.4.2 -> 3.5.0 --- pkgs/development/python-modules/pytest/default.nix | 8 ++++---- pkgs/top-level/python-packages.nix | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index 71696085b09..457826f26cb 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -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); diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d6f8e2a6e79..e134eb23993 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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;