From c08d570350333927e1ac5092e520fae83e510e13 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 12 Jun 2018 18:47:06 +0200
Subject: [PATCH] python: pytest: 3.5.1 -> 3.6.1
---
pkgs/development/python-modules/pytest/default.nix | 13 ++++++++++---
pkgs/top-level/python-packages.nix | 6 +++---
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 8e6b73b9c5e..ef60b3e8236 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -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;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 974937fac8c..5a58901b2a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -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;