From d66dd543bf0952cf488fc18008f3e68020f1d352 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Wed, 21 Mar 2018 12:45:26 -0700 Subject: [PATCH] actually update deps --- requirements-dev.txt | 12 ++++++------ requirements-docs.txt | 6 +++--- requirements-tests.in | 2 +- requirements-tests.txt | 27 ++++++++++++++------------- requirements.in | 35 ++++++++++++++++++----------------- requirements.txt | 39 ++++++++++++++++++--------------------- 6 files changed, 60 insertions(+), 61 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 8a4185e3..f94fa610 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,15 +2,15 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file requirements-dev.txt requirements-dev.in +# pip-compile --no-index --output-file requirements-dev.txt requirements-dev.in # -aspy.yaml==1.0.0 # via pre-commit -cached-property==1.4.0 # via pre-commit +aspy.yaml==1.1.0 # via pre-commit +cached-property==1.4.2 # via pre-commit certifi==2018.1.18 # via requests cfgv==1.0.0 # via pre-commit chardet==3.0.4 # via requests flake8==3.5.0 -identify==1.0.8 # via pre-commit +identify==1.0.11 # via pre-commit idna==2.6 # via requests invoke==0.22.1 mccabe==0.6.1 # via flake8 @@ -23,7 +23,7 @@ pyyaml==3.12 # via aspy.yaml, pre-commit requests-toolbelt==0.8.0 # via twine requests==2.18.4 # via requests-toolbelt, twine six==1.11.0 # via cfgv, pre-commit -tqdm==4.19.8 # via twine +tqdm==4.22.0 # via twine twine==1.11.0 urllib3==1.22 # via requests -virtualenv==15.1.0 # via pre-commit +virtualenv==15.2.0 # via pre-commit diff --git a/requirements-docs.txt b/requirements-docs.txt index 373468c1..a8b93db2 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -2,7 +2,7 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file requirements-docs.txt requirements-docs.in +# pip-compile --no-index --output-file requirements-docs.txt requirements-docs.in # alabaster==0.7.10 # via sphinx babel==2.5.3 # via sphinx @@ -16,11 +16,11 @@ markupsafe==1.0 # via jinja2 packaging==17.1 # via sphinx pygments==2.2.0 # via sphinx pyparsing==2.2.0 # via packaging -pytz==2018.3 # via babel +pytz==2018.4 # via babel requests==2.18.4 # via sphinx six==1.11.0 # via packaging, sphinx, sphinxcontrib-httpdomain snowballstemmer==1.2.1 # via sphinx -sphinx-rtd-theme==0.2.4 +sphinx-rtd-theme==0.3.0 sphinx==1.7.2 sphinxcontrib-httpdomain==1.6.1 sphinxcontrib-websupport==1.0.1 # via sphinx diff --git a/requirements-tests.in b/requirements-tests.in index 71d00c31..44a5c59f 100644 --- a/requirements-tests.in +++ b/requirements-tests.in @@ -2,7 +2,7 @@ coverage factory-boy Faker freezegun -moto>1,<2 +moto nose pyflakes pytest diff --git a/requirements-tests.txt b/requirements-tests.txt index 97819b07..4113ad2a 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -2,26 +2,26 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file requirements-tests.txt requirements-tests.in +# pip-compile --no-index --output-file requirements-tests.txt requirements-tests.in # asn1crypto==0.24.0 # via cryptography attrs==17.4.0 # via pytest aws-xray-sdk==0.95 # via moto -boto3==1.6.12 # via moto +boto3==1.7.4 # via moto boto==2.48.0 # via moto -botocore==1.9.12 # via boto3, moto, s3transfer +botocore==1.10.4 # via boto3, moto, s3transfer certifi==2018.1.18 # via requests cffi==1.11.5 # via cryptography chardet==3.0.4 # via requests click==6.7 # via flask cookies==2.2.1 # via moto coverage==4.5.1 -cryptography==2.2.1 # via moto +cryptography==2.2.2 # via moto docker-pycreds==0.2.2 # via docker -docker==3.1.4 # via moto +docker==3.2.1 # via moto docutils==0.14 # via botocore factory-boy==2.10.0 -faker==0.8.12 +faker==0.8.13 flask==0.12.2 # via pytest-flask freezegun==0.3.10 idna==2.6 # via cryptography, requests @@ -32,24 +32,25 @@ jsondiff==1.1.1 # via moto jsonpickle==0.9.6 # via aws-xray-sdk markupsafe==1.0 # via jinja2 mock==2.0.0 # via moto -moto==1.3.0 +more-itertools==4.1.0 # via pytest +moto==1.3.1 nose==1.3.7 -pbr==3.1.1 # via mock +pbr==4.0.2 # via mock pluggy==0.6.0 # via pytest -py==1.5.2 # via pytest +py==1.5.3 # via pytest pyaml==17.12.1 # via moto pycparser==2.18 # via cffi pyflakes==1.6.0 pytest-flask==0.10.0 -pytest-mock==1.7.1 -pytest==3.4.2 +pytest-mock==1.9.0 +pytest==3.5.0 python-dateutil==2.6.1 # via botocore, faker, freezegun, moto -pytz==2018.3 # via moto +pytz==2018.4 # via moto pyyaml==3.12 # via pyaml requests-mock==1.4.0 requests==2.18.4 # via aws-xray-sdk, docker, moto, requests-mock s3transfer==0.1.13 # via boto3 -six==1.11.0 # via cryptography, docker, docker-pycreds, faker, freezegun, mock, moto, pytest, python-dateutil, requests-mock, websocket-client +six==1.11.0 # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, requests-mock, websocket-client text-unidecode==1.2 # via faker urllib3==1.22 # via requests websocket-client==0.47.0 # via docker diff --git a/requirements.in b/requirements.in index b70855e6..90a48170 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ acme -alembic-autogenerate-enums==0.0.2 -arrow==0.12.0 +alembic-autogenerate-enums +arrow boto3 cryptography Flask-Bcrypt==0.7.1 @@ -11,24 +11,25 @@ Flask-RESTful==0.3.6 Flask-Script==2.0.6 Flask-SQLAlchemy Flask==0.12 -future==0.16.0 -gunicorn==19.7.1 -inflection==0.3.1 -jinja2==2.10 -lockfile==0.12.2 +Flask-Cors +future +gunicorn +inflection +jinja2 +lockfile marshmallow-sqlalchemy marshmallow -ndg-httpsclient==0.4.2 -paramiko==2.4.1 # required for lemur_linuxdst plugin -pem==17.1.0 +ndg-httpsclient +paramiko # required for the SFTP destination plugin +pem psycopg2 pyjwt -pyOpenSSL +pyOpenSSL==17.2.0 # PINNED for a specific reason. This needs to be merged in before upgrade: https://github.com/shazow/urllib3/pull/1246 python_ldap -raven[flask]==6.2.1 -requests -retrying==1.3.3 -six==1.11.0 +raven[flask] +requests==2.11.1 # PINNED for a specific reason. This needs to be merged in before upgrade: https://github.com/shazow/urllib3/pull/1246 +retrying +six SQLAlchemy-Utils -tabulate==0.8.2 -xmltodict==0.11.0 +tabulate +xmltodict diff --git a/requirements.txt b/requirements.txt index ad46fe99..5e8ef031 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,26 +2,24 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --output-file requirements.txt requirements.in +# pip-compile --no-index --output-file requirements.txt requirements.in # -<<<<<<< HEAD -acme==0.22.2 +acme==0.23.0 alembic-autogenerate-enums==0.0.2 -alembic==0.9.8 # via flask-migrate +alembic==0.9.9 # via flask-migrate aniso8601==3.0.0 # via flask-restful -arrow==0.12.0 +arrow==0.12.1 asn1crypto==0.24.0 # via cryptography bcrypt==3.1.4 # via flask-bcrypt, paramiko blinker==1.4 # via flask-mail, flask-principal, raven -boto3==1.6.12 -botocore==1.9.12 # via boto3, s3transfer -certifi==2018.1.18 # via requests +boto3==1.7.4 +botocore==1.10.4 # via boto3, s3transfer cffi==1.11.5 # via bcrypt, cryptography, pynacl -chardet==3.0.4 # via requests click==6.7 # via flask -cryptography==2.2.1 +cryptography==2.2.2 docutils==0.14 # via botocore flask-bcrypt==0.7.1 +flask-cors==3.0.3 flask-mail==0.9.1 flask-migrate==2.1.1 flask-principal==0.4.0 @@ -31,7 +29,7 @@ flask-sqlalchemy==2.3.2 flask==0.12 future==0.16.0 gunicorn==19.7.1 -idna==2.6 # via cryptography, requests +idna==2.6 # via cryptography inflection==0.3.1 itsdangerous==0.24 # via flask jinja2==2.10 @@ -43,30 +41,29 @@ markupsafe==1.0 # via jinja2, mako marshmallow-sqlalchemy==0.13.2 marshmallow==2.15.0 mock==2.0.0 # via acme -ndg-httpsclient==0.4.2 +ndg-httpsclient==0.4.4 paramiko==2.4.1 -pbr==3.1.1 # via mock +pbr==4.0.2 # via mock pem==17.1.0 psycopg2==2.7.4 pyasn1-modules==0.2.1 # via python-ldap -pyasn1==0.4.2 # via paramiko, pyasn1-modules, python-ldap +pyasn1==0.4.2 # via ndg-httpsclient, paramiko, pyasn1-modules, python-ldap, requests pycparser==2.18 # via cffi pyjwt==1.6.1 pynacl==1.2.1 # via paramiko -pyopenssl==17.5.0 +pyopenssl==17.2.0 pyrfc3339==1.0 # via acme python-dateutil==2.6.1 # via alembic, arrow, botocore python-editor==1.0.3 # via alembic python-ldap==3.0.0 -pytz==2018.3 # via acme, flask-restful, pyrfc3339 -raven[flask]==6.2.1 -requests[security]==2.18.4 +pytz==2018.4 # via acme, flask-restful, pyrfc3339 +raven[flask]==6.6.0 +requests[security]==2.11.1 retrying==1.3.3 s3transfer==0.1.13 # via boto3 six==1.11.0 -sqlalchemy-utils==0.33.1 -sqlalchemy==1.2.5 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils +sqlalchemy-utils==0.33.2 +sqlalchemy==1.2.6 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils tabulate==0.8.2 -urllib3==1.22 # via requests werkzeug==0.14.1 # via flask xmltodict==0.11.0