From ff4c38abd99891dc1bf4f90ee179eca650acfd73 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Sun, 29 Nov 2020 14:12:41 -0800
Subject: python3Packages.numpy: use pytest_5

---
 pkgs/development/python-modules/numpy/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index 622f784fb8ba..118b6cd37785 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -4,7 +4,7 @@
 , buildPythonPackage
 , gfortran
 , hypothesis
-, pytest
+, pytest_5
 , blas
 , lapack
 , writeTextFile
@@ -48,7 +48,7 @@ in buildPythonPackage rec {
     sha256 = "141ec3a3300ab89c7f2b0775289954d193cc8edb621ea05f99db9cb181530512";
   };
 
-  nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ];
+  nativeBuildInputs = [ gfortran cython setuptoolsBuildHook ];
   buildInputs = [ blas lapack ];
 
   patches = lib.optionals python.hasDistutilsCxxPatch [
@@ -75,7 +75,10 @@ in buildPythonPackage rec {
 
   doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807)
 
-  checkInputs = [ hypothesis ];
+  checkInputs = [
+    pytest_5 # pytest 6 will error: "module is already imported: hypothesis"
+    hypothesis
+  ];
 
   checkPhase = ''
     runHook preCheck
-- 
cgit v1.2.3