Merge pull request #211654 from mweinelt/one-flask-babel-is-enough

python3Packages.flask-babel: 2.0.0 -> 3.0.0

7 files changed, 49 insertions, 47 deletions

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 5828ac35fc3f..822ef3da2216 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
     cheroot
     click
     flask
-    flaskbabel
+    flask-babel
     jaraco_functools
     jinja2
     markdown2
diff --git a/pkgs/development/python-modules/flask-babel/default.nix b/pkgs/development/python-modules/flask-babel/default.nix
index 9a2aef0570ec..fa7ffee5a9cc 100644
--- a/pkgs/development/python-modules/flask-babel/default.nix
+++ b/pkgs/development/python-modules/flask-babel/default.nix
@@ -1,34 +1,66 @@
 { lib
 , buildPythonPackage
-, unittestCheckHook
-, fetchPypi
-, flask
+, fetchFromGitHub
+
+# build-system
+, poetry-core
+
+# docs
+, furo
+, sphinxHook
+
+# runtime
 , babel
+, flask
 , jinja2
 , pytz
-, speaklater
+
+# tests
+, pytest-mock
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
-  pname = "Flask-Babel";
-  version = "2.0.0";
+  pname = "flask-babel";
+  version = "3.0.0";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
+  src = fetchFromGitHub {
+    owner = "python-babel";
+    repo = "flask-babel";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-c3QKAnyMe1THHuJ3uB2d0jMMo1SYGRAB9mBpIJSAHw0=";
   };
 
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  nativeBuildInputs = [
+    furo
+    poetry-core
+    sphinxHook
+  ];
+
   propagatedBuildInputs = [
-    flask
     babel
+    flask
     jinja2
     pytz
-    speaklater
   ];
 
-  unittestFlagsArray = [ "-s" "tests" ];
+  pythonImportsCheck = [
+    "flask_babel"
+  ];
+
+  checkInputs = [
+    pytest-mock
+    pytestCheckHook
+  ];
 
   meta = with lib; {
+    changelog = "https://github.com/python-babel/flask-babel/releases/tag/v${version}";
     description = "Adds i18n/l10n support to Flask applications";
     longDescription = ''
       Implements i18n and l10n support for Flask.
@@ -36,7 +68,7 @@ buildPythonPackage rec {
       installed automatically for you if you install this library.
     '';
     license = licenses.bsd2;
-    maintainers = teams.sage.members;
+    maintainers = teams.sage.members ++ (with maintainers; [ matejc ]);
     homepage = "https://github.com/python-babel/flask-babel";
   };
 }
diff --git a/pkgs/development/python-modules/flaskbabel/default.nix b/pkgs/development/python-modules/flaskbabel/default.nix
deleted file mode 100644
index a0e42e60c2e0..000000000000
--- a/pkgs/development/python-modules/flaskbabel/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, flask
-, jinja2
-, speaklater
-, babel
-, pytz
-}:
-
-buildPythonPackage rec {
-  pname = "Flask-Babel";
-  version = "2.0.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f9faf45cdb2e1a32ea2ec14403587d4295108f35017a7821a2b1acb8cfd9257d";
-  };
-
-  propagatedBuildInputs = [ flask jinja2 speaklater babel pytz ];
-
-  meta = with lib; {
-    description = "Adds i18n/l10n support to Flask applications";
-    homepage = "https://github.com/mitsuhiko/flask-babel";
-    license = licenses.bsd0;
-    maintainers = with maintainers; [ matejc ];
-  };
-
-}
diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix
index 0026e5bdbcf1..60a8e22a4845 100644
--- a/pkgs/servers/web-apps/searx/default.nix
+++ b/pkgs/servers/web-apps/searx/default.nix
@@ -27,7 +27,7 @@ toPythonModule (buildPythonApplication rec {
     certifi
     python-dateutil
     flask
-    flaskbabel
+    flask-babel
     gevent
     grequests
     jinja2
diff --git a/pkgs/servers/web-apps/searxng/default.nix b/pkgs/servers/web-apps/searxng/default.nix
index 0ddfc5351e3f..2b1a6f69b512 100644
--- a/pkgs/servers/web-apps/searxng/default.nix
+++ b/pkgs/servers/web-apps/searxng/default.nix
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     certifi
     python-dateutil
     flask
-    flaskbabel
+    flask-babel
     brotli
     jinja2
     langdetect
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index d9728d8cb5ad..9a09ae6663f2 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -82,6 +82,7 @@ mapAliases ({
   fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
   faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
   filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
+  flaskbabel = flask-babel; # added 2023-01-19
   flask_login = flask-login; # added 2022-10-17
   flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
   flask_testing = flask-testing; # added 2022-04-25
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e034400551b7..09dbaf7ea32e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3396,8 +3396,6 @@ self: super: with self; {
 
   flask-babel = callPackage ../development/python-modules/flask-babel { };
 
-  flaskbabel = callPackage ../development/python-modules/flaskbabel { };
-
   flask-babelex = callPackage ../development/python-modules/flask-babelex { };
 
   flask-basicauth = callPackage ../development/python-modules/flask-basicauth { };