Merge branch 'master' into lemur_vault_plugin

requirements-docs.txt

@@ -4,7 +4,6 @@
 #
 #    pip-compile --output-file requirements-docs.txt requirements-docs.in -U --no-index
 #
--e git+git://github.com/kurtbrose/pyjks.git@e742f80b0bbd06c5a6cf0535985af6416ba014a4#egg=pyjks
 acme==0.33.1
 alabaster==0.7.12         # via sphinx
 alembic-autogenerate-enums==0.0.2
@@ -71,6 +70,7 @@ 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

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
--e git://github.com/kurtbrose/pyjks.git@e742f80b0bbd06c5a6cf0535985af6416ba014a4#egg=pyjks # Needed until pyjks publishes a release with the contents of this PR

requirements.txt

@@ -4,7 +4,6 @@
 #
 #    pip-compile --output-file requirements.txt requirements.in -U --no-index
 #
--e git+git://github.com/kurtbrose/pyjks.git@e742f80b0bbd06c5a6cf0535985af6416ba014a4#egg=pyjks
 acme==0.33.1
 alembic-autogenerate-enums==0.0.2
 alembic==1.0.9            # via flask-migrate
@@ -45,7 +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
+javaobj-py3==0.2.4        # via pyjks
 jinja2==2.10.1
 jmespath==0.9.4           # via boto3, botocore
 josepy==1.1.0             # via acme
@@ -62,10 +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==0.4.5             # via ndg-httpsclient, paramiko, pyasn1-modules, python-ldap
+pyasn1-modules==0.2.4     # via pyjks, python-ldap
+pyasn1==0.4.5             # via ndg-httpsclient, paramiko, pyasn1-modules, pyjks, python-ldap
 pycparser==2.19           # via cffi
-pycryptodomex==3.8.1
+pycryptodomex==3.8.1      # via pyjks
+pyjks==19.0.0
 pyjwt==1.7.1
 pynacl==1.3.0             # via paramiko
 pyopenssl==19.0.0
@@ -85,7 +85,7 @@ 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
+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