Merge pull request #174229 from dotlambda/flask-wtf-1.0.1

13 files changed, 64 insertions, 24 deletions

diff --git a/pkgs/applications/misc/archivy/default.nix b/pkgs/applications/misc/archivy/default.nix
index 0cb90ce1672..58c75201637 100644
--- a/pkgs/applications/misc/archivy/default.nix
+++ b/pkgs/applications/misc/archivy/default.nix
@@ -43,7 +43,7 @@ buildPythonApplication rec {
     elasticsearch
     flask-compress
     flask_login
-    flask_wtf
+    flask-wtf
     html2text
     python-dotenv
     python-frontmatter
diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index 990c4eb73e7..cd332b39105 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -28,7 +28,7 @@ let
     flask-bootstrap
     flask-paginate
     flask-reverse-proxy-fix
-    flask_wtf
+    flask-wtf
     arrow
     werkzeug
     click
diff --git a/pkgs/applications/misc/etesync-dav/default.nix b/pkgs/applications/misc/etesync-dav/default.nix
index aa290632748..42d16c3eaf8 100644
--- a/pkgs/applications/misc/etesync-dav/default.nix
+++ b/pkgs/applications/misc/etesync-dav/default.nix
@@ -7,12 +7,32 @@
 let
   python = python3.override {
     packageOverrides = self: super: {
-      flask_wtf = super.flask_wtf.overridePythonAttrs (old: rec {
+      flask-wtf = super.flask-wtf.overridePythonAttrs (old: rec {
         version = "0.15.1";
         src = old.src.override {
           inherit version;
           sha256 = "ff177185f891302dc253437fe63081e7a46a4e99aca61dfe086fb23e54fff2dc";
         };
+        disabledTests = [
+          "test_outside_request"
+        ];
+      });
+      werkzeug = super.werkzeug.overridePythonAttrs (old: rec {
+        version = "2.0.3";
+        src = old.src.override {
+          inherit version;
+          sha256 = "b863f8ff057c522164b6067c9e28b041161b4be5ba4d0daceeaa50a163822d3c";
+        };
+      });
+      wtforms = super.wtforms.overridePythonAttrs (old: rec {
+        version = "2.3.3";
+        src = old.src.override {
+          inherit version;
+          sha256 = "81195de0ac94fbc8368abbaf9197b88c4f3ffd6c2719b5bf5fc9da744f3d829c";
+        };
+        checkPhase = ''
+          ${self.python.interpreter} tests/runtests.py
+        '';
       });
     };
   };
@@ -29,7 +49,7 @@ in python.pkgs.buildPythonApplication rec {
     etebase
     etesync
     flask
-    flask_wtf
+    flask-wtf
     (python.pkgs.toPythonModule (radicale3.override { python3 = python; }))
   ];
 
diff --git a/pkgs/development/python-modules/apache-airflow/default.nix b/pkgs/development/python-modules/apache-airflow/default.nix
index c753458fb7e..9a3bb02a5c4 100644
--- a/pkgs/development/python-modules/apache-airflow/default.nix
+++ b/pkgs/development/python-modules/apache-airflow/default.nix
@@ -17,7 +17,7 @@
 , dill
 , flask
 , flask_login
-, flask_wtf
+, flask-wtf
 , flask-appbuilder
 , flask-caching
 , GitPython
@@ -126,7 +126,7 @@ buildPythonPackage rec {
     flask-appbuilder
     flask-caching
     flask_login
-    flask_wtf
+    flask-wtf
     GitPython
     graphviz
     gunicorn
diff --git a/pkgs/development/python-modules/flask-appbuilder/default.nix b/pkgs/development/python-modules/flask-appbuilder/default.nix
index 1d84fb88ed7..5276fceb3f5 100644
--- a/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/pkgs/development/python-modules/flask-appbuilder/default.nix
@@ -11,7 +11,7 @@
 , flask_login
 , flask-openid
 , flask_sqlalchemy
-, flask_wtf
+, flask-wtf
 , flask-jwt-extended
 , jsonschema
 , marshmallow
@@ -62,7 +62,7 @@ buildPythonPackage rec {
     flask_login
     flask-openid
     flask_sqlalchemy
-    flask_wtf
+    flask-wtf
     flask-jwt-extended
     jsonschema
     marshmallow
diff --git a/pkgs/development/python-modules/flask-mongoengine/default.nix b/pkgs/development/python-modules/flask-mongoengine/default.nix
index f7cb7224dc5..ee05ff42033 100644
--- a/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/pkgs/development/python-modules/flask-mongoengine/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchFromGitHub
 , flask
-, flask_wtf
+, flask-wtf
 , mongoengine
 , six
 , nose
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     email_validator
     flask
-    flask_wtf
+    flask-wtf
     mongoengine
     six
   ];
diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix
index eb9c01699e5..ec088d5332c 100644
--- a/pkgs/development/python-modules/flask-security-too/default.nix
+++ b/pkgs/development/python-modules/flask-security-too/default.nix
@@ -27,7 +27,7 @@
 , flask
 , flask_login
 , flask_principal
-, flask_wtf
+, flask-wtf
 , itsdangerous
 , passlib
 
@@ -58,7 +58,7 @@ buildPythonPackage rec {
     flask
     flask_login
     flask_principal
-    flask_wtf
+    flask-wtf
     itsdangerous
     passlib
   ];
diff --git a/pkgs/development/python-modules/flask-wtf/default.nix b/pkgs/development/python-modules/flask-wtf/default.nix
index 2c7dd221e92..fcfa4835be7 100644
--- a/pkgs/development/python-modules/flask-wtf/default.nix
+++ b/pkgs/development/python-modules/flask-wtf/default.nix
@@ -1,17 +1,36 @@
-{ lib, fetchPypi, buildPythonPackage, flask, wtforms, nose }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+, flask
+, itsdangerous
+, wtforms
+, email_validator
+, pytestCheckHook
+}:
 
 buildPythonPackage rec {
-  pname = "Flask-WTF";
-  version = "1.0.0";
+  pname = "flask-wtf";
+  version = "1.0.1";
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "872fbb17b5888bfc734edbdcf45bc08fb365ca39f69d25dc752465a455517b28";
+    pname = "Flask-WTF";
+    inherit version;
+    sha256 = "34fe5c6fee0f69b50e30f81a3b7ea16aa1492a771fe9ad0974d164610c09a6c9";
   };
 
-  propagatedBuildInputs = [ flask wtforms nose ];
+  propagatedBuildInputs = [
+    flask
+    itsdangerous
+    wtforms
+  ];
 
-  doCheck = false; # requires external service
+  passthru.optional-dependencies = {
+    email = [ email_validator ];
+  };
+
+  checkInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "Simple integration of Flask and WTForms.";
diff --git a/pkgs/development/python-modules/ihatemoney/default.nix b/pkgs/development/python-modules/ihatemoney/default.nix
index 459ebe5ad51..dafea4e2cb2 100644
--- a/pkgs/development/python-modules/ihatemoney/default.nix
+++ b/pkgs/development/python-modules/ihatemoney/default.nix
@@ -19,7 +19,7 @@
 , flask-restful
 , flask_sqlalchemy
 , flask-talisman
-, flask_wtf
+, flask-wtf
 , debts
 , idna
 , itsdangerous
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     flask
     flask_mail
     flask_migrate
-    flask_wtf
+    flask-wtf
     flask-babel
     flask-cors
     flask-restful
diff --git a/pkgs/servers/calibre-web/default.nix b/pkgs/servers/calibre-web/default.nix
index 675230478f9..20e0e8f1383 100644
--- a/pkgs/servers/calibre-web/default.nix
+++ b/pkgs/servers/calibre-web/default.nix
@@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec {
     flask-babel
     flask_login
     flask_principal
-    flask_wtf
+    flask-wtf
     iso-639
     lxml
     pypdf3
diff --git a/pkgs/tools/admin/pgadmin/default.nix b/pkgs/tools/admin/pgadmin/default.nix
index 53b9d548523..a5120bb1f15 100644
--- a/pkgs/tools/admin/pgadmin/default.nix
+++ b/pkgs/tools/admin/pgadmin/default.nix
@@ -34,7 +34,7 @@ let
     flask_mail
     flask_migrate
     flask_sqlalchemy
-    flask_wtf
+    flask-wtf
     flask-compress
     passlib
     pytz
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 5e421b9c336..c65ab7ebe8c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -67,6 +67,7 @@ mapAliases ({
   eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
   faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
   flask_testing = flask-testing; # added 2022-04-25
+  flask_wtf = flask-wtf; # added 2022-05-24
   garminconnect-ha = garminconnect; # added 2022-02-05
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34a318a6e07..8354c082142 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3122,7 +3122,7 @@ in {
 
   flask-versioned = callPackage ../development/python-modules/flask-versioned { };
 
-  flask_wtf = callPackage ../development/python-modules/flask-wtf { };
+  flask-wtf = callPackage ../development/python-modules/flask-wtf { };
 
   flatbuffers = callPackage ../development/python-modules/flatbuffers {
     inherit (pkgs) flatbuffers;