Merge branch 'master' into add-pending-certificate-upload

requirements-docs.txt

@@ -47,6 +47,7 @@ idna==2.8
 imagesize==1.1.0          # via sphinx
 inflection==0.3.1
 itsdangerous==1.1.0
+javaobj-py3==0.2.4
 jinja2==2.10.1
 jmespath==0.9.4
 josepy==1.1.0
@@ -67,7 +68,9 @@ psycopg2==2.8.2
 pyasn1-modules==0.2.4
 pyasn1==0.4.5
 pycparser==2.19
+pycryptodomex==3.8.1
 pygments==2.3.1           # via sphinx
+pyjks==19.0.0
 pyjwt==1.7.1
 pynacl==1.3.0
 pyopenssl==19.0.0
@@ -97,6 +100,7 @@ sphinxcontrib-serializinghtml==1.1.3  # via sphinx
 sqlalchemy-utils==0.33.11
 sqlalchemy==1.3.3
 tabulate==0.8.3
+twofish==0.3.0
 urllib3==1.24.2
 vine==1.3.0
 werkzeug==0.15.2

requirements-tests.txt

@@ -7,12 +7,14 @@
 asn1crypto==0.24.0        # via cryptography
 atomicwrites==1.3.0       # via pytest
 attrs==19.1.0             # via pytest
-aws-xray-sdk==0.95        # via moto
+aws-sam-translator==1.10.0  # via cfn-lint
-boto3==1.9.134            # via moto
+aws-xray-sdk==2.4.2       # via moto
+boto3==1.9.134            # via aws-sam-translator, moto
 boto==2.49.0              # via moto
-botocore==1.12.134        # via boto3, moto, s3transfer
+botocore==1.12.134        # via aws-xray-sdk, boto3, moto, s3transfer
 certifi==2019.3.9         # via requests
 cffi==1.12.3              # via cryptography
+cfn-lint==0.19.1          # via moto
 chardet==3.0.4            # via requests
 click==7.0                # via flask
 coverage==4.5.3
@@ -25,37 +27,40 @@ factory-boy==2.11.1
 faker==1.0.5
 flask==1.0.2              # via pytest-flask
 freezegun==0.3.11
-future==0.17.1            # via python-jose
+future==0.17.1            # via aws-xray-sdk, python-jose
-idna==2.8                 # via requests
+idna==2.8                 # via moto, requests
 itsdangerous==1.1.0       # via flask
 jinja2==2.10.1            # via flask, moto
 jmespath==0.9.4           # via boto3, botocore
-jsondiff==1.1.1           # via moto
+jsondiff==1.1.2           # via moto
+jsonpatch==1.23           # via cfn-lint
 jsonpickle==1.1           # via aws-xray-sdk
+jsonpointer==2.0          # via jsonpatch
+jsonschema==2.6.0         # via aws-sam-translator, cfn-lint
 markupsafe==1.1.1         # via jinja2
 mock==2.0.0               # via moto
 more-itertools==7.0.0     # via pytest
-moto==1.3.7
+moto==1.3.8
 nose==1.3.7
 pbr==5.1.3                # via mock
 pluggy==0.9.0             # via pytest
 py==1.8.0                 # via pytest
-pyaml==19.4.1             # via moto
+pyasn1==0.4.5             # via rsa
 pycparser==2.19           # via cffi
-pycryptodome==3.8.1       # via python-jose
 pyflakes==2.1.1
 pytest-flask==0.14.0
 pytest-mock==1.10.4
 pytest==4.4.1
 python-dateutil==2.8.0    # via botocore, faker, freezegun, moto
-python-jose==2.0.2        # via moto
+python-jose==3.0.1        # via moto
 pytz==2019.1              # via moto
 pyyaml==5.1
 requests-mock==1.5.2
-requests==2.21.0          # via aws-xray-sdk, docker, moto, requests-mock, responses
+requests==2.21.0          # via cfn-lint, docker, moto, requests-mock, responses
 responses==0.10.6         # via moto
+rsa==4.0                  # via python-jose
 s3transfer==0.2.0         # via boto3
-six==1.12.0               # via cryptography, docker, docker-pycreds, faker, freezegun, mock, moto, pytest, python-dateutil, python-jose, requests-mock, responses, websocket-client
+six==1.12.0               # via aws-sam-translator, cfn-lint, cryptography, docker, docker-pycreds, faker, freezegun, mock, moto, pytest, python-dateutil, python-jose, requests-mock, responses, websocket-client
 text-unidecode==1.2       # via faker
 urllib3==1.24.2           # via botocore, requests
 websocket-client==0.56.0  # via docker

requirements.in

@@ -35,8 +35,10 @@ ndg-httpsclient
 paramiko  # required for the SFTP destination plugin
 pem
 psycopg2
+pyjks >= 19 # pyjks < 19 depends on pycryptodome, which conflicts with dyn's usage of pycrypto
 pyjwt
 pyOpenSSL
+pyyaml>=4.2b1 #high severity alert
 python_ldap
 raven[flask]
 redis
@@ -46,5 +48,3 @@ six
 SQLAlchemy-Utils
 tabulate
 xmltodict
-pyyaml>=4.2b1 #high severity alert
-pyjks

requirements.txt

@@ -44,6 +44,7 @@ hvac==0.8.2
 idna==2.8                 # via requests
 inflection==0.3.1
 itsdangerous==1.1.0       # via flask
+javaobj-py3==0.2.4        # via pyjks
 jinja2==2.10.1
 jmespath==0.9.4           # via boto3, botocore
 josepy==1.1.0             # via acme
@@ -60,9 +61,11 @@ paramiko==2.4.2
 pbr==5.1.3                # via mock
 pem==19.1.0
 psycopg2==2.8.2
-pyasn1-modules==0.2.4     # via python-ldap
+pyasn1-modules==0.2.4     # via pyjks, python-ldap
-pyasn1==0.4.5             # via ndg-httpsclient, paramiko, pyasn1-modules, python-ldap
+pyasn1==0.4.5             # via ndg-httpsclient, paramiko, pyasn1-modules, pyjks, python-ldap
 pycparser==2.19           # via cffi
+pycryptodomex==3.8.1      # via pyjks
+pyjks==19.0.0
 pyjwt==1.7.1
 pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
@@ -82,8 +85,8 @@ six==1.12.0
 sqlalchemy-utils==0.33.11
 sqlalchemy==1.3.3         # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
 tabulate==0.8.3
+twofish==0.3.0            # via pyjks
 urllib3==1.24.2           # via botocore, requests
 vine==1.3.0               # via amqp, celery
 werkzeug==0.15.2          # via flask
 xmltodict==0.12.0
-pyjks==18.0.0