Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-Flask-Admin for openSUSE:Factory checked in at 2023-07-10 16:39:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-Flask-Admin (Old) and /work/SRC/openSUSE:Factory/.python-Flask-Admin.new.23466 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Flask-Admin" Mon Jul 10 16:39:47 2023 rev:15 rq:1097852 version:1.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-Flask-Admin/python-Flask-Admin.changes 2023-06-19 22:50:41.633608355 +0200 +++ /work/SRC/openSUSE:Factory/.python-Flask-Admin.new.23466/python-Flask-Admin.changes 2023-07-10 16:39:48.334508842 +0200 @@ -1,0 +2,7 @@ +Mon Jul 10 02:12:28 UTC 2023 - Steve Kowalik <steven.kowa...@suse.com> + +- Add patch switch-to-babel.patch: + * Use Flask-Babel, rather than Flask-BabelEx. +- Skip a recalcitrant test. + +------------------------------------------------------------------- New: ---- switch-to-babel.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-Flask-Admin.spec ++++++ --- /var/tmp/diff_new_pack.FovAon/_old 2023-07-10 16:39:49.034513014 +0200 +++ /var/tmp/diff_new_pack.FovAon/_new 2023-07-10 16:39:49.038513038 +0200 @@ -16,7 +16,6 @@ # -%define skip_python2 1 Name: python-Flask-Admin Version: 1.6.1 Release: 0 @@ -24,8 +23,11 @@ License: BSD-3-Clause URL: https://github.com/flask-admin/flask-admin/ Source: https://files.pythonhosted.org/packages/source/F/Flask-Admin/Flask-Admin-%{version}.tar.gz +# PATCH-FIX-OPENSUSE Flask-BabelEx has been firmly deprecated, switch to Babel +# directly. +Patch0: switch-to-babel.patch BuildRequires: %{python_module Flask >= 0.7} -BuildRequires: %{python_module Flask-BabelEx} +BuildRequires: %{python_module Flask-Babel} BuildRequires: %{python_module Flask-SQLAlchemy} BuildRequires: %{python_module Pillow >= 3.3.2} BuildRequires: %{python_module PyYAML} @@ -75,7 +77,7 @@ %python_expand %fdupes %{buildroot}%{$python_sitelib} %check -%pytest -k 'not test_model and not test_inline_form_base_class' +%pytest -k 'not test_model and not test_inline_form_base_class and not test_safe_redirect' %files %{python_files} %license LICENSE ++++++ switch-to-babel.patch ++++++ Index: Flask-Admin-1.6.1/flask_admin/tests/sqla/test_basic.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/tests/sqla/test_basic.py +++ Flask-Admin-1.6.1/flask_admin/tests/sqla/test_basic.py @@ -7,7 +7,7 @@ from flask_admin.form.fields import Sele from flask_admin._compat import as_unicode from flask_admin._compat import iteritems from flask_admin.contrib.sqla import ModelView, filters, tools -from flask_babelex import Babel +from flask_babel import Babel from sqlalchemy.ext.hybrid import hybrid_property from sqlalchemy import cast Index: Flask-Admin-1.6.1/flask_admin/tests/sqla/test_translation.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/tests/sqla/test_translation.py +++ Flask-Admin-1.6.1/flask_admin/tests/sqla/test_translation.py @@ -1,5 +1,5 @@ from flask_admin.babel import lazy_gettext -from flask_babelex import Babel +from flask_babel import Babel from . import setup from .test_basic import CustomModelView, create_models Index: Flask-Admin-1.6.1/flask_admin/babel.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/babel.py +++ Flask-Admin-1.6.1/flask_admin/babel.py @@ -1,8 +1,5 @@ try: - try: - from flask_babelex import Domain - except ImportError: - from flask_babel import Domain + from flask_babel import Domain except ImportError: def gettext(string, **variables): Index: Flask-Admin-1.6.1/flask_admin/base.py =================================================================== --- Flask-Admin-1.6.1.orig/flask_admin/base.py +++ Flask-Admin-1.6.1/flask_admin/base.py @@ -524,6 +524,13 @@ class Admin(object): # Add index view self._set_admin_index_view(index_view=index_view, endpoint=endpoint, url=url) + # Initialise Babel, if we have it + try: + from flask_babel import Babel + Babel(app) + except ImportError: + pass + # Register with application if app is not None: self._init_extension()
