Support latest flask, sqlalchemy, flask-sqlalchemy and wtforms

.github/workflows/test.yaml

@@ -1,4 +1,6 @@
 name: Run tests
+permissions:
+  contents: read
 on:
   push:
     branches:
@@ -8,17 +10,15 @@ on:
       - master
 
 jobs:
-  test-job:
+  tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11']
-        tox-version: [ 'WTForms2' ]
+        python-version: ['3.9', '3.10', '3.11', '3.12']
+        tox-env: [py]
         include:
-          - python-version: 3.11
-            tox-version: flake8
-          - python-version: 3.11
-            tox-version: docs-html
+          - python-version: '3.8'
+            tox-env: minreqs
     services:
       # Label used to access the service container
       postgres:
@@ -64,4 +64,21 @@ jobs:
       - name: Install tox
         run: pip install tox
       - name: Run tests
-        run: tox -e ${{ matrix.tox-version }}
+        run: tox -e ${{ matrix.tox-env }}
+  checks:
+    name: ${{ matrix.tox-env }}
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        tox-env: [flake8, docs-html]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Install tox
+        run: pip install tox
+      - name: Run ${{ matrix.tox-env }}
+        run: tox -e ${{ matrix.tox-env }}

flask_admin/contrib/sqla/ajax.py

@@ -64,7 +64,7 @@ def get_query(self):
     def get_one(self, pk):
         # prevent autoflush from occuring during populate_obj
         with self.session.no_autoflush:
-            return self.get_query().get(pk)
+            return self.session.get(self.model, pk)
 
     def get_list(self, term, offset=0, limit=DEFAULT_PAGE_SIZE):
         query = self.get_query()

flask_admin/contrib/sqla/filters.py

@@ -207,7 +207,6 @@ def apply(self, query, value, alias=None):
 class DateNotBetweenFilter(DateBetweenFilter):
     def apply(self, query, value, alias=None):
         start, end = value
-        # ~between() isn't possible until sqlalchemy 1.0.0
         return query.filter(not_(self.get_column(alias).between(start, end)))
 
     def operation(self):

flask_admin/contrib/sqla/form.py

@@ -669,6 +669,7 @@ def _calculate_mapping_key_pair(self, model, info):
 
         reverse_props = []
         forward_reverse_props_keys = dict()
+        model.registry.configure()
         for prop in target_mapper.iterate_properties:
             if hasattr(prop, 'direction') and prop.direction.name in ('MANYTOONE', 'MANYTOMANY'):
                 if issubclass(model, prop.mapper.class_):

flask_admin/contrib/sqla/tools.py

@@ -1,17 +1,12 @@
 import types
 
 from sqlalchemy import tuple_, or_, and_, inspect
-try:
-    # Attempt _class_resolver import from SQLALchemy 1.4/2.0 module architecture.
-    from sqlalchemy.orm.clsregistry import _class_resolver
-except ImportError:
-    # If 1.4/2.0 module import fails, fall back to <1.3.x architecture.
-    from sqlalchemy.ext.declarative.clsregistry import _class_resolver
+from sqlalchemy.orm.clsregistry import _class_resolver
 from sqlalchemy.ext.hybrid import hybrid_property
 try:
-    # Attempt ASSOCATION_PROXY import from pre-2.0 release
     from sqlalchemy.ext.associationproxy import ASSOCIATION_PROXY
 except ImportError:
+    # SQLAlchemy 2.0
     from sqlalchemy.ext.associationproxy import AssociationProxyExtensionType
     ASSOCIATION_PROXY = AssociationProxyExtensionType.ASSOCIATION_PROXY
 from sqlalchemy.sql.operators import eq

flask_admin/contrib/sqla/view.py

@@ -366,6 +366,7 @@ def _get_model_iterator(self, model=None):
         if model is None:
             model = self.model
 
+        model.registry.configure()
         return model._sa_class_manager.mapper.iterate_properties
 
     def _apply_path_joins(self, query, joins, path, inner_join=True):

flask_admin/form/__init__.py

@@ -14,16 +14,17 @@
 
 
 class BaseForm(form.Form):
-    _translations = Translations()
+    class Meta:
+        _translations = Translations()
+
+        def get_translations(self, form):
+            return self._translations
 
     def __init__(self, formdata=None, obj=None, prefix=u'', **kwargs):
         self._obj = obj
 
         super(BaseForm, self).__init__(formdata=formdata, obj=obj, prefix=prefix, **kwargs)
 
-    def _get_translations(self):
-        return self._translations
-
 
 class FormOpts(object):
     __slots__ = ['widget_args', 'form_rules']

flask_admin/tests/fileadmin/test_fileadmin.py

@@ -1,4 +1,4 @@
-from io import StringIO
+from io import BytesIO
 import os
 import os.path as op
 import unittest
@@ -76,7 +76,7 @@ class MyFileAdmin(fileadmin_class):
             assert rv.status_code == 200
 
             rv = client.post('/admin/myfileadmin/upload/',
-                             data=dict(upload=(StringIO(""), 'dummy.txt')))
+                             data=dict(upload=(BytesIO("".encode("utf8")), 'dummy.txt')))
             assert rv.status_code == 302
 
             rv = client.get('/admin/myfileadmin/')

flask_admin/tests/mongoengine/test_basic.py

@@ -116,8 +116,8 @@ def test_model():
     model = Model1.objects.first()
     assert model.test1 == 'test1large'
     assert model.test2 == 'test2'
-    assert model.test3 == ''
-    assert model.test4 == ''
+    assert model.test3 in ('', None)  # WTForms 2, WTForms 3
+    assert model.test4 in ('', None)  # WTForms 2, WTForms 3
 
     rv = client.get('/admin/model1/')
     assert rv.status_code == 200
@@ -134,8 +134,8 @@ def test_model():
     model = Model1.objects.first()
     assert model.test1 == 'test1small'
     assert model.test2 == 'test2large'
-    assert model.test3 == ''
-    assert model.test4 == ''
+    assert model.test3 in ('', None)  # WTForms 2, WTForms 3
+    assert model.test4 in ('', None)  # WTForms 2, WTForms 3
 
     url = '/admin/model1/delete/?id=%s' % model.id
     rv = client.post(url)
@@ -152,6 +152,10 @@ def test_column_editable_list():
                            column_editable_list=['test1', 'datetime_field'])
     admin.add_view(view)
 
+    # Test in-line editing for relations
+    view = CustomModelView(Model2, column_editable_list=['model1'])
+    admin.add_view(view)
+
     fill_db(Model1, Model2)
 
     client = app.test_client()
@@ -199,10 +203,6 @@ def test_column_editable_list():
     data = rv.data.decode('utf-8')
     assert 'problematic-input' not in data
 
-    # Test in-line editing for relations
-    view = CustomModelView(Model2, column_editable_list=['model1'])
-    admin.add_view(view)
-
     obj3 = Model2.objects.get(string_field='string_field_val_1')
     rv = client.post('/admin/model2/ajax/update/', data={
         'list_form_pk': str(obj3.id),
@@ -300,6 +300,26 @@ def test_column_filters():
             (6, 'not in list'),
         ]
 
+    # Test numeric filter
+    view2 = CustomModelView(Model2, column_filters=['int_field'])
+    admin.add_view(view2)
+
+    # Test boolean filter
+    view3 = CustomModelView(Model2, column_filters=['bool_field'],
+                            endpoint="_bools")
+    admin.add_view(view3)
+
+    # Test float filter
+    view4 = CustomModelView(Model2, column_filters=['float_field'],
+                            endpoint="_float")
+    admin.add_view(view4)
+
+    # Test datetime filter
+    view5 = CustomModelView(Model1,
+                            column_filters=['datetime_field'],
+                            endpoint="_datetime")
+    admin.add_view(view5)
+
     # Make some test clients
     client = app.test_client()
 
@@ -365,12 +385,8 @@ def test_column_filters():
     assert 'test1_val_3' in data
     assert 'test1_val_4' in data
 
-    # Test numeric filter
-    view = CustomModelView(Model2, column_filters=['int_field'])
-    admin.add_view(view)
-
     assert \
-        [(f['index'], f['operation']) for f in view._filter_groups[u'Int Field']] == \
+        [(f['index'], f['operation']) for f in view2._filter_groups[u'Int Field']] == \
         [
             (0, 'equals'),
             (1, 'not equal'),
@@ -471,13 +487,8 @@ def test_column_filters():
     assert 'string_field_val_3' not in data
     assert 'string_field_val_4' not in data
 
-    # Test boolean filter
-    view = CustomModelView(Model2, column_filters=['bool_field'],
-                           endpoint="_bools")
-    admin.add_view(view)
-
     assert \
-        [(f['index'], f['operation']) for f in view._filter_groups[u'Bool Field']] == \
+        [(f['index'], f['operation']) for f in view3._filter_groups[u'Bool Field']] == \
         [
             (0, 'equals'),
             (1, 'not equal'),
@@ -511,13 +522,8 @@ def test_column_filters():
     assert 'string_field_val_1' in data
     assert 'string_field_val_2' not in data
 
-    # Test float filter
-    view = CustomModelView(Model2, column_filters=['float_field'],
-                           endpoint="_float")
-    admin.add_view(view)
-
     assert \
-        [(f['index'], f['operation']) for f in view._filter_groups[u'Float Field']] == \
+        [(f['index'], f['operation']) for f in view4._filter_groups[u'Float Field']] == \
         [
             (0, 'equals'),
             (1, 'not equal'),
@@ -604,14 +610,8 @@ def test_column_filters():
     assert 'string_field_val_3' not in data
     assert 'string_field_val_4' not in data
 
-    # Test datetime filter
-    view = CustomModelView(Model1,
-                           column_filters=['datetime_field'],
-                           endpoint="_datetime")
-    admin.add_view(view)
-
     assert \
-        [(f['index'], f['operation']) for f in view._filter_groups[u'Datetime Field']] == \
+        [(f['index'], f['operation']) for f in view5._filter_groups[u'Datetime Field']] == \
         [
             (0, 'equals'),
             (1, 'not equal'),
@@ -1185,6 +1185,11 @@ def test_export_csv():
                            endpoint='row_limit_2')
     admin.add_view(view)
 
+    view = CustomModelView(Model1, can_export=True,
+                           column_list=['test1', 'test2'],
+                           endpoint='no_row_limit')
+    admin.add_view(view)
+
     for x in range(5):
         fill_db(Model1, Model2)
 
@@ -1198,11 +1203,6 @@ def test_export_csv():
         "test1_val_1,test2_val_1\r\n" + \
         "test1_val_2,test2_val_2\r\n" == data
 
-    view = CustomModelView(Model1, can_export=True,
-                           column_list=['test1', 'test2'],
-                           endpoint='no_row_limit')
-    admin.add_view(view)
-
     # test row limit without export_max_rows
     rv = client.get('/admin/no_row_limit/export/csv/')
     data = rv.data.decode('utf-8')