Merge pull request #815 from simpsonw/update_dependencies

Update dependencies

dev_requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o dev_requirements.txt dev_requirements.in requirements.txt
+#    pip-compile --output-file=dev_requirements.txt dev_requirements.in requirements.txt
 #
 apache-libcloud==0.20.1
 asn1crypto==0.22.0
@@ -18,15 +18,15 @@ chardet==3.0.4
 colorama==0.3.9
 contextlib2==0.5.5
 coverage==4.4.1
-cryptography==2.0
+cryptography==2.7
 debtcollector==1.17.0
 decorator==4.1.1          # via ipython, traitlets
 django-cyverse-auth==1.2.0
 django-jenkins==0.110.0
 django-sslserver==0.19
 django-webpack-loader==0.5.0
-django==1.11.3
-djangorestframework==3.6.3
+django==1.11.22
+djangorestframework==3.9.4
 emoji==0.4.5
 enum34==1.1.6
 funcsigs==1.0.2
@@ -38,8 +38,8 @@ ipython-genutils==0.2.0   # via traitlets
 ipython==5.4.1
 iso8601==0.1.11
 itsdangerous==0.24
-jinja2==2.9.6
-jwt.py==0.1.0
+jinja2==2.10.1
+jwt.py==0.1.1
 keystoneauth1==3.0.0
 markdown==2.6.8
 markupsafe==1.0
@@ -66,18 +66,18 @@ ptyprocess==0.5.2         # via pexpect
 pyasn1-modules==0.2.4
 pyasn1==0.4.5
 pycparser==2.18
-pycrypto==2.6.1
+pycryptodome==3.8.2
 pygments==2.2.0           # via ipython
 pyjwt==1.5.2
-pyopenssl==17.2.0
+pyopenssl==19.0.0
 pyparsing==2.2.0
 python-dateutil==2.6.1
 python-keystoneclient==3.12.0
 python-ldap==3.1.0
 pytz==2017.2
-pyyaml==3.12
+pyyaml==5.1.1
 raven==6.1.0
-requests[security]==2.18.1
+requests[security]==2.22.0
 rfc3986==1.1.0
 rsa==3.4.2
 scandir==1.5              # via pathlib2
@@ -88,7 +88,10 @@ splinter==0.7.5           # via behaving
 stevedore==1.25.0
 threepio==0.2
 traitlets==4.3.2          # via ipython
-urllib3==1.21.1
+urllib3==1.25.3
 uwsgi==2.0.15
 wcwidth==0.1.7            # via prompt-toolkit
 wrapt==1.10.10
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via django-sslserver, ipdb, ipython

requirements.in

@@ -1,20 +1,23 @@
 # External/Third Party
 pycparser
-django
+django>=1.11.22
 django-sslserver
 
-djangorestframework
+cryptography>=2.3
+djangorestframework>=3.9.1
 markdown
 
 django-webpack-loader
 itsdangerous
-Jinja2
-pycrypto
+Jinja2>=2.10.1
 PyJWT
 python-dateutil
 psycopg2==2.7.3.1
-requests[security]
+requests[security]>=2.20.0
+urllib3>=1.24.2
 uWSGI
+pyyaml>=4.2b1
+pyopenssl>=17.5.0
 
 # Application Insights
 raven

requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile -o requirements.txt requirements.in
+#    pip-compile --output-file=requirements.txt requirements.in
 #
 apache-libcloud==0.20.1   # via django-cyverse-auth
 asn1crypto==0.22.0        # via cryptography
@@ -13,22 +13,22 @@ certifi==2017.4.17        # via requests
 cffi==1.10.0              # via cryptography
 chardet==3.0.4            # via requests
 contextlib2==0.5.5        # via raven
-cryptography==2.0         # via pyopenssl, requests
+cryptography==2.7
 debtcollector==1.17.0     # via oslo.config, oslo.utils, python-keystoneclient
 django-cyverse-auth==1.2.0
 django-sslserver==0.19
 django-webpack-loader==0.5.0
-django==1.11.3
-djangorestframework==3.6.3
+django==1.11.22
+djangorestframework==3.9.4
 enum34==1.1.6             # via cryptography
 funcsigs==1.0.2           # via debtcollector, oslo.utils
 httplib2==0.10.3          # via oauth2client
-idna==2.5                 # via cryptography, requests
+idna==2.5                 # via requests
 ipaddress==1.0.18         # via cryptography
 iso8601==0.1.11           # via keystoneauth1, oslo.utils
 itsdangerous==0.24
-jinja2==2.9.6
-jwt.py==0.1.0             # via django-cyverse-auth
+jinja2==2.10.1
+jwt.py==0.1.1             # via django-cyverse-auth
 keystoneauth1==3.0.0      # via django-cyverse-auth, python-keystoneclient
 markdown==2.6.8
 markupsafe==1.0           # via jinja2
@@ -48,22 +48,25 @@ psycopg2==2.7.3.1
 pyasn1-modules==0.2.4     # via oauth2client, python-ldap
 pyasn1==0.4.5             # via oauth2client, pyasn1-modules, python-ldap, rsa
 pycparser==2.18
-pycrypto==2.6.1
+pycryptodome==3.8.2       # via jwt.py
 pyjwt==1.5.2
-pyopenssl==17.2.0         # via requests
+pyopenssl==19.0.0
 pyparsing==2.2.0          # via oslo.utils
 python-dateutil==2.6.1
 python-keystoneclient==3.12.0  # via django-cyverse-auth
 python-ldap==3.1.0        # via django-cyverse-auth
 pytz==2017.2              # via babel, django, oslo.serialization, oslo.utils
-pyyaml==3.12              # via oslo.config
+pyyaml==5.1.1
 raven==6.1.0
-requests[security]==2.18.1
+requests[security]==2.22.0
 rfc3986==1.1.0            # via oslo.config
 rsa==3.4.2                # via oauth2client
 six==1.10.0               # via cryptography, debtcollector, keystoneauth1, oauth2client, oslo.config, oslo.i18n, oslo.serialization, oslo.utils, pyopenssl, python-dateutil, python-keystoneclient, stevedore
 stevedore==1.25.0         # via keystoneauth1, oslo.config, python-keystoneclient
 threepio==0.2             # via django-cyverse-auth
-urllib3==1.21.1           # via requests
+urllib3==1.25.3
 uwsgi==2.0.15
 wrapt==1.10.10            # via debtcollector, positional
+
+# The following packages are considered to be unsafe in a requirements file:
+# setuptools==41.0.1        # via django-sslserver