From af7d06ed59d9caa1bb03de7c6624d93b2c084cdf Mon Sep 17 00:00:00 2001
From: Armeen Mahdian <mahdianarmeen@gmail.com>
Date: Mon, 25 Apr 2022 09:42:36 -0500
Subject: [PATCH] fenics: use normal pytest

---
 .../fenics/default.nix                        | 28 +++++++------------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 11 insertions(+), 19 deletions(-)
 rename pkgs/development/{libraries/science/math => python-modules}/fenics/default.nix (96%)

diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/python-modules/fenics/default.nix
similarity index 96%
rename from pkgs/development/libraries/science/math/fenics/default.nix
rename to pkgs/development/python-modules/fenics/default.nix
index 9ca4d6314c1..f1ccc5efc84 100644
--- a/pkgs/development/libraries/science/math/fenics/default.nix
+++ b/pkgs/development/python-modules/fenics/default.nix
@@ -1,45 +1,37 @@
 { lib, stdenv
 , fetchurl
 , fetchpatch
+, blas
 , boost
 , cmake
 , doxygen
 , eigen
+, gtest
+, hdf5
+, lapack
+, mpi
 , mpi4py
 , numpy
 , pkg-config
+, ply
 , pybind11
 , pytest
-, pythonPackages
-, six
-, sympy
-, gtest
-, hdf5
-, mpi
-, ply
 , python
+, pythonPackages
 , scotch
 , setuptools
+, six
 , sphinx
 , suitesparse
 , swig
+, sympy
 , zlib
-, blas
-, lapack
 , nixosTests
 }:
+
 let
   version = "2019.1.0";
 
-  # TODO: test with newer pytest
-  pytest = pythonPackages.callPackage
-    ../../../../python2-modules/pytest {
-      # hypothesis tests require pytest that causes dependency cycle
-      hypothesis = pythonPackages.hypothesis.override {
-        doCheck = false;
-      };
-    };
-
   dijitso = pythonPackages.buildPythonPackage {
     pname = "dijitso";
     inherit version;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a07866054b7..c3a229827fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2877,7 +2877,7 @@ in {
 
   feedparser = callPackage ../development/python-modules/feedparser { };
 
-  fenics = callPackage ../development/libraries/science/math/fenics {
+  fenics = callPackage ../development/python-modules/fenics {
     hdf5 = pkgs.hdf5_1_10;
     boost = pkgs.boost169;
   };