From 40e0078b9ce720d28e71f3149e00b368dfa568b4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 9 Nov 2021 12:22:20 +0100
Subject: [PATCH] python3Packages.flask-admin: 1.5.6 -> 1.5.8

---
 .../python-modules/flask-admin/default.nix    | 106 +++++++++---------
 1 file changed, 56 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/python-modules/flask-admin/default.nix b/pkgs/development/python-modules/flask-admin/default.nix
index dc1e795054fe..bfdf0e46ea58 100644
--- a/pkgs/development/python-modules/flask-admin/default.nix
+++ b/pkgs/development/python-modules/flask-admin/default.nix
@@ -1,80 +1,86 @@
 { lib
+, arrow
 , buildPythonPackage
+, colour
+, email_validator
+, enum34
 , fetchPypi
-, nose
-, pillow
+, flask
+, flask_sqlalchemy
+, flask-babelex
+, flask-mongoengine
+, geoalchemy2
+, isPy27
 , mongoengine
+, pillow
+, psycopg2
 , pymongo
-, wtf-peewee
+, pytestCheckHook
+, shapely
 , sqlalchemy
 , sqlalchemy-citext
 , sqlalchemy-utils
-, flask-mongoengine
-, flask_sqlalchemy
-, flask-babelex
-, shapely
-, geoalchemy2
-, psycopg2
-, arrow
-, colour
-, email_validator
-, flask
+, wtf-peewee
 , wtforms
-, isPy27
-, enum34
 }:
 
 buildPythonPackage rec {
   pname = "flask-admin";
-  version = "1.5.6";
+  version = "1.5.8";
+  format = "setuptools";
 
   src = fetchPypi {
     pname = "Flask-Admin";
     inherit version;
-    sha256 = "1f31vzc0p2xni5mh1wvjk9jxf4ddlx2fj4r0f3vv2n9db3c63iv8";
+    sha256 = "sha256-6wah8xuYiB3uU6VcZPrr0ZkNaqw4gmNksoDfCyZ5/3Q=";
   };
 
-  checkInputs = [
-    nose
-    pillow
-    mongoengine
-    pymongo
-    wtf-peewee
-    sqlalchemy
-    sqlalchemy-citext
-    sqlalchemy-utils
-    flask-mongoengine
-    flask_sqlalchemy
-    flask-babelex
-    shapely
-    geoalchemy2
-    psycopg2
-    arrow
-    colour
-    email_validator
-  ];
-
   propagatedBuildInputs = [
     flask
     wtforms
-  ] ++ lib.optionals isPy27 [ enum34 ];
+  ] ++ lib.optionals isPy27 [
+    enum34
+  ];
 
-  checkPhase = ''
-    # disable tests that require mongodb, postresql, or network
-    nosetests \
-     -e "mongoengine" \
-     -e "pymongo" \
-     -e "test_form_upload" \
-     -e "test_postgres" \
-     -e "geoa" \
-     -e "test_ajax_fk" \
-     flask_admin/tests
-  '';
+  checkInputs = [
+    arrow
+    colour
+    email_validator
+    flask_sqlalchemy
+    flask-babelex
+    flask-mongoengine
+    geoalchemy2
+    mongoengine
+    pillow
+    psycopg2
+    pymongo
+    pytestCheckHook
+    shapely
+    sqlalchemy
+    sqlalchemy-citext
+    sqlalchemy-utils
+    wtf-peewee
+  ];
+
+  disabledTestPaths = [
+    # Tests have additional requirements
+    "flask_admin/tests/geoa/test_basic.py"
+    "flask_admin/tests/mongoengine/test_basic.py"
+    "flask_admin/tests/pymongo/test_basic.py"
+    "flask_admin/tests/sqla/test_basic.py"
+    "flask_admin/tests/sqla/test_form_rules.py"
+    "flask_admin/tests/sqla/test_postgres.py"
+    "flask_admin/tests/sqla/test_translation.py"
+  ];
+
+  pythonImportsCheck = [
+    "flask_admin"
+  ];
 
   meta = with lib; {
     description = "Simple and extensible admin interface framework for Flask";
     homepage = "https://github.com/flask-admin/flask-admin/";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }