From 82ae353234b0bf5e82c8067f04ba3acd78a641af Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Sun, 21 Jul 2019 13:42:29 +0300 Subject: [PATCH 1/4] Bump requirements.txt --- requirements.txt | 88 +++++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 43 deletions(-) diff --git a/requirements.txt b/requirements.txt index d04421ac7503e..03a8d31c04b99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,81 +4,83 @@ # # pip-compile --output-file=requirements.txt setup.py # -alembic==1.0.0 # via flask-migrate +alembic==1.0.11 # via flask-migrate amqp==2.5.0 # via kombu -apispec[yaml]==1.2.0 # via flask-appbuilder +apispec[yaml]==2.0.2 # via flask-appbuilder asn1crypto==0.24.0 # via cryptography attrs==19.1.0 # via jsonschema -babel==2.6.0 # via flask-babel +babel==2.7.0 # via flask-babel billiard==3.6.0.0 # via celery -bleach==3.0.2 +bleach==3.1.0 celery==4.3.0 -certifi==2018.8.24 # via requests -cffi==1.11.5 # via cryptography +certifi==2019.6.16 # via requests +cffi==1.12.3 # via cryptography chardet==3.0.4 # via requests click==6.7 -colorama==0.3.9 +colorama==0.4.1 contextlib2==0.5.5 -croniter==0.3.29 -cryptography==2.4.2 -decorator==4.3.0 # via retry -defusedxml==0.5.0 # via python3-openid +croniter==0.3.30 +cryptography==2.7 +decorator==4.4.0 # via retry +defusedxml==0.6.0 # via python3-openid flask-appbuilder==2.1.6 -flask-babel==0.11.1 # via flask-appbuilder -flask-caching==1.4.0 +flask-babel==0.12.2 # via flask-appbuilder +flask-caching==1.7.2 flask-compress==1.4.0 -flask-jwt-extended==3.18.1 # via flask-appbuilder +flask-jwt-extended==3.20.0 # via flask-appbuilder flask-login==0.4.1 # via flask-appbuilder -flask-migrate==2.1.1 +flask-migrate==2.5.2 flask-openid==1.2.5 # via flask-appbuilder flask-sqlalchemy==2.4.0 # via flask-appbuilder, flask-migrate -flask-talisman==0.6.0 +flask-talisman==0.7.0 flask-wtf==0.14.2 -flask==1.0.2 -geopy==1.11.0 -gunicorn==19.8.0 +flask==1.1.1 +future==0.17.1 # via parsedatetime +geographiclib==1.49 # via geopy +geopy==1.20.0 +gunicorn==19.9.0 humanize==0.5.1 -idna==2.6 +idna==2.8 isodate==0.6.0 -itsdangerous==0.24 # via flask +itsdangerous==1.1.0 # via flask jinja2==2.10.1 # via flask, flask-babel jsonschema==3.0.1 # via flask-appbuilder kombu==4.6.3 # via celery -mako==1.0.7 # via alembic -markdown==3.0 -markupsafe==1.0 # via jinja2, mako +mako==1.0.14 # via alembic +markdown==3.1.1 +markupsafe==1.1.1 # via jinja2, mako 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 +marshmallow-sqlalchemy==0.17.0 # via flask-appbuilder +marshmallow==2.19.5 # via flask-appbuilder, marshmallow-enum, marshmallow-sqlalchemy +numpy==1.16.4 # via pandas pandas==0.24.2 -parsedatetime==2.0.0 -pathlib2==2.3.0 -polyline==1.3.2 +parsedatetime==2.4 +pathlib2==2.3.4 +polyline==1.4.0 prison==0.1.2 # via flask-appbuilder -py==1.7.0 # via retry +py==1.8.0 # via retry pycparser==2.19 # via cffi pydruid==0.5.6 pyjwt==1.7.1 # via flask-appbuilder, flask-jwt-extended -pyrsistent==0.14.11 # via jsonschema -python-dateutil==2.6.1 -python-dotenv==0.10.1 -python-editor==1.0.3 # via alembic +pyrsistent==0.15.3 # via jsonschema +python-dateutil==2.8.0 +python-dotenv==0.10.3 +python-editor==1.0.4 # via alembic python-geohash==0.8.5 python3-openid==3.1.0 # via flask-openid -pytz==2018.5 # via babel, celery, pandas -pyyaml==5.1 +pytz==2019.1 # via babel, celery, pandas +pyyaml==5.1.1 requests==2.22.0 retry==0.9.2 selenium==3.141.0 -simplejson==3.15.0 -six==1.11.0 # via bleach, cryptography, flask-jwt-extended, flask-talisman, isodate, jsonschema, pathlib2, polyline, prison, pydruid, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json -sqlalchemy-utils==0.33.11 +simplejson==3.16.0 +six==1.12.0 # via bleach, cryptography, flask-jwt-extended, flask-talisman, isodate, jsonschema, pathlib2, polyline, prison, pydruid, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json +sqlalchemy-utils==0.34.1 sqlalchemy==1.3.5 -sqlparse==0.2.4 -urllib3==1.24.3 # via requests, selenium +sqlparse==0.3.0 +urllib3==1.25.3 # via requests, selenium vine==1.3.0 # via amqp, celery webencodings==0.5.1 # via bleach -werkzeug==0.14.1 # via flask, flask-jwt-extended +werkzeug==0.15.5 # via flask, flask-jwt-extended wtforms-json==0.3.3 wtforms==2.2.1 # via flask-wtf, wtforms-json From 096bd2ac5dab1714d46c47fa1180db30ae71ca88 Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Thu, 1 Aug 2019 17:25:02 +0300 Subject: [PATCH 2/4] Cap gunicorn to <19.9.0 due to X-Forwarded-Proto regression --- requirements.txt | 16 ++++++++-------- setup.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 03a8d31c04b99..6dc0c0c95a2de 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ # alembic==1.0.11 # via flask-migrate amqp==2.5.0 # via kombu -apispec[yaml]==2.0.2 # via flask-appbuilder +apispec[yaml]==1.3.3 # via flask-appbuilder asn1crypto==0.24.0 # via cryptography attrs==19.1.0 # via jsonschema babel==2.7.0 # via flask-babel @@ -23,7 +23,7 @@ croniter==0.3.30 cryptography==2.7 decorator==4.4.0 # via retry defusedxml==0.6.0 # via python3-openid -flask-appbuilder==2.1.6 +flask-appbuilder==2.1.7 flask-babel==0.12.2 # via flask-appbuilder flask-caching==1.7.2 flask-compress==1.4.0 @@ -38,7 +38,7 @@ flask==1.1.1 future==0.17.1 # via parsedatetime geographiclib==1.49 # via geopy geopy==1.20.0 -gunicorn==19.9.0 +gunicorn==19.8.1 humanize==0.5.1 idna==2.8 isodate==0.6.0 @@ -52,7 +52,7 @@ markupsafe==1.1.1 # via jinja2, mako marshmallow-enum==1.4.1 # via flask-appbuilder marshmallow-sqlalchemy==0.17.0 # via flask-appbuilder marshmallow==2.19.5 # via flask-appbuilder, marshmallow-enum, marshmallow-sqlalchemy -numpy==1.16.4 # via pandas +numpy==1.17.0 # via pandas pandas==0.24.2 parsedatetime==2.4 pathlib2==2.3.4 @@ -62,21 +62,21 @@ py==1.8.0 # via retry pycparser==2.19 # via cffi pydruid==0.5.6 pyjwt==1.7.1 # via flask-appbuilder, flask-jwt-extended -pyrsistent==0.15.3 # via jsonschema +pyrsistent==0.15.4 # via jsonschema python-dateutil==2.8.0 python-dotenv==0.10.3 python-editor==1.0.4 # via alembic python-geohash==0.8.5 python3-openid==3.1.0 # via flask-openid -pytz==2019.1 # via babel, celery, pandas -pyyaml==5.1.1 +pytz==2019.2 # via babel, celery, pandas +pyyaml==5.1.2 requests==2.22.0 retry==0.9.2 selenium==3.141.0 simplejson==3.16.0 six==1.12.0 # via bleach, cryptography, flask-jwt-extended, flask-talisman, isodate, jsonschema, pathlib2, polyline, prison, pydruid, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json sqlalchemy-utils==0.34.1 -sqlalchemy==1.3.5 +sqlalchemy==1.3.6 sqlparse==0.3.0 urllib3==1.25.3 # via requests, selenium vine==1.3.0 # via amqp, celery diff --git a/setup.py b/setup.py index be11cffd2af91..e8a48422266b0 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ def get_git_sha(): "flask-migrate", "flask-wtf", "geopy", - "gunicorn", # deprecated + "gunicorn<19.9.0", # deprecated "humanize", "idna", "isodate", From 132b0642cd4c5cdfcf5cb0820c2f4845235ab556 Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Thu, 1 Aug 2019 17:52:56 +0300 Subject: [PATCH 3/4] Remove python-dotenv from requirements-dev.txt --- requirements-dev.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 4ee189557b9dc..67a13e78d88e1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -29,7 +29,6 @@ psycopg2-binary==2.7.5 pycodestyle==2.5.0 pyhive==0.6.1 pylint==1.9.2 -python-dotenv==0.10.1 redis==3.2.1 statsd==3.3.0 tox==3.11.1 From f04eb3a3c6c2ce4b855202b41ac57e278a3b8cec Mon Sep 17 00:00:00 2001 From: Ville Brofeldt Date: Thu, 1 Aug 2019 18:29:45 +0300 Subject: [PATCH 4/4] Cap sqlparse due to regression in 0.3.0 --- requirements.txt | 5 ++++- setup.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6dc0c0c95a2de..54265b1cc7216 100644 --- a/requirements.txt +++ b/requirements.txt @@ -77,10 +77,13 @@ simplejson==3.16.0 six==1.12.0 # via bleach, cryptography, flask-jwt-extended, flask-talisman, isodate, jsonschema, pathlib2, polyline, prison, pydruid, pyrsistent, python-dateutil, sqlalchemy-utils, wtforms-json sqlalchemy-utils==0.34.1 sqlalchemy==1.3.6 -sqlparse==0.3.0 +sqlparse==0.2.4 urllib3==1.25.3 # via requests, selenium vine==1.3.0 # via amqp, celery webencodings==0.5.1 # via bleach werkzeug==0.15.5 # via flask, flask-jwt-extended wtforms-json==0.3.3 wtforms==2.2.1 # via flask-wtf, wtforms-json + +# The following packages are considered to be unsafe in a requirements file: +# setuptools==41.0.1 # via jsonschema, markdown diff --git a/setup.py b/setup.py index e8a48422266b0..e63eaebd015ca 100644 --- a/setup.py +++ b/setup.py @@ -100,7 +100,7 @@ def get_git_sha(): "simplejson>=3.15.0", "sqlalchemy>=1.3.5,<2.0", "sqlalchemy-utils>=0.33.2", - "sqlparse", + "sqlparse<0.3", "wtforms-json", ], extras_require={