Merge pull request apache#134 from airbnb/erik-ritter--upgrade-fab-re…

…lease Upgrade FAB to 2.1.6
michellethomas · Jul 8, 2019 · dd2a4b0 · dd2a4b0
2 parents 04577bc + 8db5259
commit dd2a4b0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -6,7 +6,7 @@
 #
 alembic==1.0.0            # via flask-migrate
 amqp==2.3.2               # via kombu
-apispec[yaml]==1.2.0
+apispec[yaml]==1.2.0      # via flask-appbuilder
 asn1crypto==0.24.0        # via cryptography
 attrs==19.1.0             # via jsonschema
 babel==2.6.0              # via flask-babel
@@ -23,15 +23,15 @@ croniter==0.3.29
 cryptography==2.4.2
 decorator==4.3.0          # via retry
 defusedxml==0.5.0         # via python3-openid
-git+git://github.com/dpgaspar/Flask-AppBuilder@93d3583192667e11f121a52d9c9a1342a2454d4a#egg=flask-appbuilder
-flask-babel==0.11.1
+flask-appbuilder==2.1.6
+flask-babel==0.11.1       # via flask-appbuilder
 flask-caching==1.4.0
 flask-compress==1.4.0
-flask-jwt-extended==3.18.1
-flask-login==0.4.1
+flask-jwt-extended==3.18.1  # via flask-appbuilder
+flask-login==0.4.1        # via flask-appbuilder
 flask-migrate==2.1.1
-flask-openid==1.2.5
-flask-sqlalchemy==2.4.0   # via flask-migrate
+flask-openid==1.2.5       # via flask-appbuilder
+flask-sqlalchemy==2.4.0   # via flask-appbuilder, flask-migrate
 flask-talisman==0.6.0
 flask-wtf==0.14.2
 flask==1.0.2
@@ -42,24 +42,24 @@ idna==2.6
 isodate==0.6.0
 itsdangerous==0.24        # via flask
 jinja2==2.10              # via flask, flask-babel
-jsonschema==3.0.1
+jsonschema==3.0.1         # via flask-appbuilder
 kombu==4.2.1              # via celery
 mako==1.0.7               # via alembic
 markdown==3.0
 markupsafe==1.0           # via jinja2, mako
-marshmallow-enum==1.4.1
-marshmallow-sqlalchemy==0.16.2
-marshmallow==2.19.2       # via marshmallow-enum, marshmallow-sqlalchemy
+marshmallow-enum==1.4.1   # via flask-appbuilder
+marshmallow-sqlalchemy==0.16.2  # via flask-appbuilder
+marshmallow==2.19.2       # via flask-appbuilder, marshmallow-enum, marshmallow-sqlalchemy
 numpy==1.15.2             # via pandas
 pandas==0.23.4
 parsedatetime==2.0.0
 pathlib2==2.3.0
 polyline==1.3.2
-prison==0.1.2
+prison==0.1.2             # via flask-appbuilder
 py==1.7.0                 # via retry
 pycparser==2.19           # via cffi
 pydruid==0.5.2
-pyjwt==1.7.1              # via flask-jwt-extended
+pyjwt==1.7.1              # via flask-appbuilder, flask-jwt-extended
 pyrsistent==0.14.11       # via jsonschema
 python-dateutil==2.6.1
 python-editor==1.0.3      # via alembic

diff --git a/setup.py b/setup.py
@@ -77,8 +77,7 @@ def get_git_sha():
         'croniter>=0.3.28',
         'cryptography>=2.4.2',
         'flask>=1.0.0, <2.0.0',
-        'flask-appbuilder @ git+git://github.com/dpgaspar/Flask-AppBuilder' +
-        '@93d3583192667e11f121a52d9c9a1342a2454d4a#egg=flask-appbuilder',
+        'flask-appbuilder>=2.1.6, <2.3.0',
         'flask-caching',
         'flask-compress',
         'flask-talisman',