Merge pull request #1137 from castrapel/req_up

Upodate reqs

requirements-dev.txt

@@ -26,4 +26,4 @@ six==1.11.0               # via cfgv, pre-commit
 tqdm==4.19.8              # 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

requirements-tests.txt

@@ -7,9 +7,9 @@
 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.6.16             # via moto
 boto==2.48.0              # via moto
-botocore==1.9.12          # via boto3, moto, s3transfer
+botocore==1.9.16          # via boto3, moto, s3transfer
 certifi==2018.1.18        # via requests
 cffi==1.11.5              # via cryptography
 chardet==3.0.4            # via 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
+more-itertools==4.1.0     # via pytest
 moto==1.3.1
 nose==1.3.7
 pbr==3.1.1                # 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.5.0
-python-dateutil==2.7.2    # via botocore, faker, freezegun, moto
+python-dateutil==2.6.1    # via botocore, faker, freezegun, moto
 pytz==2018.3              # 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

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,24 @@ 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
+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 lemur_linuxdst plugin
+pem
 psycopg2
 pyjwt
-pyOpenSSL==17.2.0
+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==2.11.1
-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

requirements.txt

@@ -8,12 +8,12 @@ acme==0.22.2
 alembic-autogenerate-enums==0.0.2
 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
+boto3==1.6.16
+botocore==1.9.16          # via boto3, s3transfer
 cffi==1.11.5              # via bcrypt, cryptography, pynacl
 click==6.7                # via flask
 cryptography==2.2.1
@@ -40,13 +40,13 @@ 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
 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, requests
+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
@@ -56,7 +56,7 @@ 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
+raven[flask]==6.6.0
 requests[security]==2.11.1
 retrying==1.3.3
 s3transfer==0.1.13        # via boto3