diff --git a/requirements.txt b/requirements.txt index 0cc4ff0e9b..5a08fff212 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,60 +1,60 @@ -Flask==0.12.4 -Werkzeug==0.11.11 -Jinja2==2.8 -itsdangerous==0.24 -click==6.6 -MarkupSafe==0.23 -pyOpenSSL==17.5.0 -httplib2==0.10.3 +Flask==1.1.1 +Werkzeug==0.16.0 +Jinja2==2.10.3 +itsdangerous==1.1.0 +click==6.7 +MarkupSafe==1.1.1 +pyOpenSSL==19.0.0 +httplib2==0.14.0 wtforms==2.2.1 -Flask-RESTful==0.3.5 -Flask-Login==0.4.0 +Flask-RESTful==0.3.7 +Flask-Login==0.4.1 Flask-OAuthLib==0.9.5 # pin this until https://github.com/lepture/flask-oauthlib/pull/388 is released requests-oauthlib>=0.6.2,<1.2.0 -Flask-SQLAlchemy==2.3.2 -Flask-Migrate==2.0.1 +Flask-SQLAlchemy==2.4.1 +Flask-Migrate==2.5.2 flask-mail==0.9.1 -flask-talisman==0.6.0 +flask-talisman==0.7.0 Flask-Limiter==0.9.3 -passlib==1.6.2 -aniso8601==1.1.0 -blinker==1.3 -psycopg2==2.7.3.2 +passlib==1.7.1 +aniso8601==8.0.0 +blinker==1.4 +psycopg2==2.8.3 python-dateutil==2.8.0 -pytz==2016.7 -PyYAML==3.12 -redis==3.2.1 -requests==2.21.0 +pytz==2019.3 +PyYAML==5.1.2 +redis==3.3.11 +requests==2.22.0 six==1.12.0 -SQLAlchemy==1.2.12 +SQLAlchemy==1.3.10 # We can't upgrade SQLAlchemy-Searchable version as newer versions require PostgreSQL > 9.6, but we target older versions at the moment. SQLAlchemy-Searchable==0.10.6 # We need to pin the version of pyparsing, as newer versions break SQLAlchemy-Searchable-10.0.6 (newer versions no longer depend on it) pyparsing==2.3.0 -SQLAlchemy-Utils==0.33.11 -sqlparse==0.2.4 -statsd==2.1.2 -gunicorn==19.7.1 +SQLAlchemy-Utils==0.34.2 +sqlparse==0.3.0 +statsd==3.3.0 +gunicorn==19.9.0 rq==1.1.0 -rq-scheduler==0.9 +rq-scheduler==0.9.1 celery==4.3.0 -kombu==4.6.3 -jsonschema==2.4.0 -RestrictedPython==3.6.0 -pysaml2==4.5.0 +kombu==4.6.5 +jsonschema==3.1.1 +RestrictedPython==5.0 +pysaml2==4.8.0 pycrypto==2.6.1 -funcy==1.7.1 +funcy==1.13 sentry-sdk>=0.12.2,<0.13.0 -semver==2.2.1 -xlsxwriter==0.9.3 +semver==2.8.1 +xlsxwriter==1.2.2 pystache==0.5.4 -parsedatetime==2.1 -PyJWT==1.6.4 -cryptography==2.3 +parsedatetime==2.4 +PyJWT==1.7.1 +cryptography==2.7 simplejson==3.16.0 -ua-parser==0.7.3 -user-agents==1.1.0 +ua-parser==0.8.0 +user-agents==2.0 python-geoip-geolite2==2015.303 chromelogger==0.4.3 pypd==1.1.0 diff --git a/requirements_all_ds.txt b/requirements_all_ds.txt index bfa9672b3d..99ce19d105 100644 --- a/requirements_all_ds.txt +++ b/requirements_all_ds.txt @@ -11,8 +11,8 @@ td-client==1.0.0 pymssql==2.1.4 dql==0.5.26 dynamo3==0.4.10 -boto3==1.9.241 -botocore==1.12.241 +boto3>=1.9.241,<1.10.0 +botocore>=1.12.241,<1.13.0 sasl>=0.1.3 thrift>=0.8.0 thrift_sasl>=0.1.0 diff --git a/requirements_dev.txt b/requirements_dev.txt index 7bdca558ef..14d803d005 100644 --- a/requirements_dev.txt +++ b/requirements_dev.txt @@ -1,13 +1,13 @@ -pytest==5.2.0 -pytest-cov==2.7.1 +pytest==5.2.1 +pytest-cov==2.8.1 coverage==4.5.4 -mock==2.0.0 +mock==3.0.5 # PyMongo and Athena dependencies are needed for some of the unit tests: # (this is not perfect and we should resolve this in a different way) -pymongo[tls,srv]==3.6.1 -botocore==1.12.241 +pymongo[srv,tls]==3.9.0 +botocore>=1.12.241,<1.13.0 PyAthena>=1.5.0 -ptvsd==4.2.3 -freezegun==0.3.11 +ptvsd==4.3.2 +freezegun==0.3.12 watchdog==0.9.0 diff --git a/tests/__init__.py b/tests/__init__.py index 4b08b7450e..0fa57deb36 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -95,10 +95,6 @@ def make_request(self, method, path, org=None, user=None, data=None, content_type=content_type, follow_redirects=follow_redirects, ) - - if response.data and is_json: - response.json = json_loads(response.data) - return response def get_request(self, path, org=None, headers=None):