Merge pull request pallets-eco#2182 from gunlinux/ci-fixes

mrjoes · web-flow · commit 280b7031dd2d · 2021-11-28T22:37:33.000-05:00
build: CI passing all tests
diff --git a/flask_admin/tests/sqla/test_basic.py b/flask_admin/tests/sqla/test_basic.py
@@ -1,4 +1,3 @@
-import re
 import pytest
 
 from wtforms import fields, validators
diff --git a/flask_admin/tests/test_base.py b/flask_admin/tests/test_base.py
@@ -246,9 +246,9 @@ def test_add_category():
 
     # Test 2 should be underneath Category2
     assert admin.menu()[2].name == 'Category2'
-    assert admin.menu()[2].get_class_name() == None
-    assert admin.menu()[2].get_icon_type() == None
-    assert admin.menu()[2].get_icon_value() == None
+    assert admin.menu()[2].get_class_name() is None
+    assert admin.menu()[2].get_icon_type() is None
+    assert admin.menu()[2].get_icon_value() is None
     assert len(admin.menu()[2].get_children()) == 1
     assert admin.menu()[2].get_children()[0].name == 'Test 2'
 
diff --git a/flask_admin/tests/test_model.py b/flask_admin/tests/test_model.py
@@ -146,8 +146,8 @@ def test_mockview():
     assert view._sortable_columns == ['col1', 'col2', 'col3']
     assert view._create_form_class == Form
     assert view._edit_form_class == Form
-    assert view._search_supported == False
-    assert view._filters == None
+    assert view._search_supported is False
+    assert view._filters is None
 
     client = app.test_client()
 
@@ -303,7 +303,7 @@ def test_column_searchable_list():
     view = MockModelView(Model, column_searchable_list=['col1', 'col2'])
     admin.add_view(view)
 
-    assert view._search_supported == True
+    assert view._search_supported is True
 
     # TODO: Make calls with search
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -7,7 +7,7 @@ mongoengine<=0.21.0
 pymongo
 flask-mongoengine==0.8.2
 pillow>=3.3.2
-Babel<=1.3
+Babel<=2.9.1
 flask-babelex
 shapely==1.5.9
 geoalchemy2
@@ -23,3 +23,4 @@ azure-storage-blob
 arrow<0.14.0
 colour
 email-validator
+wtforms==2.3.3

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-import re`
`2`	`1`	`import pytest`
`3`	`2`
`4`	`3`	`from wtforms import fields, validators`