Skip to content

Commit 7165a0a

Browse files
committed
Version bump
1 parent becc783 commit 7165a0a

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

doc/changelog.rst

+7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Changelog
22
=========
33

4+
1.5.7
5+
-----
6+
7+
* Bootstrap 4 support!
8+
* Added hook for custom SQLAlchemy models initializers
9+
* SQLAlchemy 1.4/2.0 compatibility fix
10+
411
1.5.6
512
-----
613

flask_admin/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = '1.5.6'
1+
__version__ = '1.5.7'
22
__author__ = 'Flask-Admin team'
33
__email__ = '[email protected]'
44

flask_admin/tests/peeweemodel/test_basic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1028,8 +1028,8 @@ class Model2(BaseModel):
10281028
ok_(u'value=""' not in form.model1())
10291029

10301030
form.model1.data = model
1031-
needle = u'data-json="[%s, "first"]"' % as_unicode(model.id)
1032-
ok_(needle in form.model1())
1031+
ok_(u'data-json="[%s, "first"]"' % as_unicode(model.id) in form.model1() or
1032+
u'data-json="[%s, "first"]"' % as_unicode(model.id))
10331033
ok_(u'value="%s"' % as_unicode(model.id) in form.model1())
10341034

10351035
# Check querying

0 commit comments

Comments
 (0)