Merge branch 'master' into deps/bump-dependencies

CHANGELOG.rst

@@ -1,6 +1,16 @@
 Flask-AppBuilder ChangeLog
 ==========================
 
+Improvements and Bug fixes on 3.3.3
+-----------------------------------
+
+- fix: related filters with bogus data (#1695) [Daniel Vaz Gaspar]
+- chore: Bump flask-openid to 1.3.0 (#1693) [Daniel Vaz Gaspar]
+- chore: bump JQuery to 3.6.0 (#1688) [Daniel Vaz Gaspar]
+- chore: bump prison version (#1689) [Beto Dealmeida]
+- feat: password complexity option on DB Auth (#1687) [Daniel Vaz Gaspar]
+- fix: check if there is an email field in userinfo (#1663) [Yoshitaka Sakurai]
+
 Improvements and Bug fixes on 3.3.2
 -----------------------------------
 

docs/rest_api.rst

@@ -43,7 +43,7 @@ So we can make a request to our method using::
 
     $ curl http://localhost:8080/api/v1/exampleapi/greeting
 
-To override the base route class blueprint, override the ``base_route`` property,
+To override the base route class blueprint, override the ``route_base`` property,
 so on our previous example::
 
     from flask_appbuilder.api import BaseApi, expose
@@ -52,7 +52,7 @@ so on our previous example::
 
     class ExampleApi(BaseApi):
 
-        base_route = '/newapi/v2/nice'
+        route_base = '/newapi/v2/nice'
 
         @expose('/greeting')
         def greeting(self):

flask_appbuilder/__init__.py

@@ -1,5 +1,5 @@
 __author__ = "Daniel Vaz Gaspar"
-__version__ = "3.3.2"
+__version__ = "3.3.3"
 
 from .actions import action  # noqa: F401
 from .api import ModelRestApi  # noqa: F401

rtd_requirements.txt

@@ -9,7 +9,7 @@ defusedxml==0.5.0         # via python3-openid
 flask-babel==1.0.0
 flask-jwt-extended==3.18.0
 flask-login==0.4.1
-flask-openid==1.2.5
+flask-openid==1.3.0
 flask-sqlalchemy==2.4.0
 flask-wtf==0.14.2
 flask==1.1.1