Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into master

This commit is contained in:
Hossein Shafagh 2020-01-03 14:20:02 -08:00 committed by GitHub
parent 9b9662d470 deaac42dba
commit f446fcc1c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 125 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
requirements-dev.txt
View File

@ -6,35 +6,36 @@
# #
aspy.yaml==1.3.0 # via pre-commit aspy.yaml==1.3.0 # via pre-commit
bleach==3.1.0 # via readme-renderer bleach==3.1.0 # via readme-renderer
certifi==2019.9.11 # via requests certifi==2019.11.28 # via requests
cfgv==2.0.1 # via pre-commit cfgv==2.0.1 # via pre-commit
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
docutils==0.15.2 # via readme-renderer docutils==0.15.2 # via readme-renderer
flake8==3.5.0 flake8==3.5.0
identify==1.4.7 # via pre-commit identify==1.4.9 # via pre-commit
idna==2.8 # via requests idna==2.8 # via requests
importlib-metadata==0.23 # via pre-commit importlib-metadata==1.3.0 # via keyring, pre-commit, twine
invoke==1.3.0 invoke==1.3.0
keyring==21.0.0 # via twine
mccabe==0.6.1 # via flake8 mccabe==0.6.1 # via flake8
more-itertools==7.2.0 # via zipp more-itertools==8.0.2 # via zipp
nodeenv==1.3.3 nodeenv==1.3.3
pkginfo==1.5.0.1 # via twine pkginfo==1.5.0.1 # via twine
pre-commit==1.18.3 pre-commit==1.21.0
pycodestyle==2.3.1 # via flake8 pycodestyle==2.3.1 # via flake8
pyflakes==1.6.0 # via flake8 pyflakes==1.6.0 # via flake8
pygments==2.4.2 # via readme-renderer pygments==2.5.2 # via readme-renderer
pyyaml==5.1.2 pyyaml==5.2
readme-renderer==24.0 # via twine readme-renderer==24.0 # via twine
requests-toolbelt==0.9.1 # via twine requests-toolbelt==0.9.1 # via twine
requests==2.22.0 # via requests-toolbelt, twine requests==2.22.0 # via requests-toolbelt, twine
six==1.12.0 # via bleach, cfgv, pre-commit, readme-renderer six==1.13.0 # via bleach, cfgv, pre-commit, readme-renderer
toml==0.10.0 # via pre-commit toml==0.10.0 # via pre-commit
tqdm==4.36.1 # via twine tqdm==4.41.1 # via twine
twine==2.0.0 twine==3.1.1
urllib3==1.25.6 # via requests urllib3==1.25.7 # via requests
virtualenv==16.7.5 # via pre-commit virtualenv==16.7.9 # via pre-commit
webencodings==0.5.1 # via bleach webencodings==0.5.1 # via bleach
zipp==0.6.0 # via importlib-metadata zipp==0.6.0 # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
# setuptools==41.4.0 # via twine # setuptools

74
requirements-docs.txt
View File

@ -4,29 +4,28 @@
# #
# pip-compile --no-index --output-file=requirements-docs.txt requirements-docs.in # pip-compile --no-index --output-file=requirements-docs.txt requirements-docs.in
# #
acme==0.39.0 acme==1.0.0
alabaster==0.7.12 # via sphinx alabaster==0.7.12 # via sphinx
alembic-autogenerate-enums==0.0.2 alembic-autogenerate-enums==0.0.2
alembic==1.2.1 alembic==1.3.2
amqp==2.5.2 amqp==2.5.2
aniso8601==8.0.0 aniso8601==8.0.0
arrow==0.15.2 arrow==0.15.5
asn1crypto==1.1.0
asyncpool==1.0 asyncpool==1.0
babel==2.7.0 # via sphinx babel==2.8.0 # via sphinx
bcrypt==3.1.7 bcrypt==3.1.7
billiard==3.6.1.0 billiard==3.6.1.0
blinker==1.4 blinker==1.4
boto3==1.9.250 boto3==1.10.46
botocore==1.12.250 botocore==1.13.46
celery[redis]==4.3.0 celery[redis]==4.4.0
certifi==2019.9.11 certifi==2019.11.28
certsrv==2.1.1 certsrv==2.1.1
cffi==1.13.0 cffi==1.13.2
chardet==3.0.4 chardet==3.0.4
click==7.0 click==7.0
cloudflare==2.3.0 cloudflare==2.3.1
cryptography==2.7 cryptography==2.8
dnspython3==1.15.0 dnspython3==1.15.0
dnspython==1.15.0 dnspython==1.15.0
docutils==0.15.2 docutils==0.15.2
@ -41,57 +40,59 @@ flask-restful==0.3.7
flask-script==2.0.6 flask-script==2.0.6
flask-sqlalchemy==2.4.1 flask-sqlalchemy==2.4.1
flask==1.1.1 flask==1.1.1
future==0.18.0 future==0.18.2
gunicorn==19.9.0 gunicorn==20.0.4
hvac==0.9.5 hvac==0.9.6
idna==2.8 idna==2.8
imagesize==1.1.0 # via sphinx imagesize==1.2.0 # via sphinx
importlib-metadata==1.3.0
inflection==0.3.1 inflection==0.3.1
itsdangerous==1.1.0 itsdangerous==1.1.0
javaobj-py3==0.3.0 javaobj-py3==0.4.0.1
jinja2==2.10.3 jinja2==2.10.3
jmespath==0.9.4 jmespath==0.9.4
josepy==1.2.0 josepy==1.2.0
jsonlines==1.2.0 jsonlines==1.2.0
kombu==4.5.0 kombu==4.6.7
lockfile==0.12.2 lockfile==0.12.2
logmatic-python==0.1.7 logmatic-python==0.1.7
mako==1.1.0 mako==1.1.0
markupsafe==1.1.1 markupsafe==1.1.1
marshmallow-sqlalchemy==0.19.0 marshmallow-sqlalchemy==0.21.0
marshmallow==2.20.4 marshmallow==2.20.4
mock==3.0.5 mock==3.0.5
more-itertools==8.0.2
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
packaging==19.2 # via sphinx packaging==19.2 # via sphinx
paramiko==2.6.0 paramiko==2.7.1
pem==19.2.0 pem==19.3.0
psycopg2==2.8.3 psycopg2==2.8.4
pyasn1-modules==0.2.7 pyasn1-modules==0.2.7
pyasn1==0.4.7 pyasn1==0.4.8
pycparser==2.19 pycparser==2.19
pycryptodomex==3.9.0 pycryptodomex==3.9.4
pygments==2.4.2 # via sphinx pygments==2.5.2 # via sphinx
pyjks==19.0.0 pyjks==19.0.0
pyjwt==1.7.1 pyjwt==1.7.1
pynacl==1.3.0 pynacl==1.3.0
pyopenssl==19.0.0 pyopenssl==19.1.0
pyparsing==2.4.2 # via packaging pyparsing==2.4.6 # via packaging
pyrfc3339==1.1 pyrfc3339==1.1
python-dateutil==2.8.0 python-dateutil==2.8.1
python-editor==1.0.4 python-editor==1.0.4
python-json-logger==0.1.11 python-json-logger==0.1.11
pytz==2019.3 pytz==2019.3
pyyaml==5.1.2 pyyaml==5.2
raven[flask]==6.10.0 raven[flask]==6.10.0
redis==3.3.11 redis==3.3.11
requests-toolbelt==0.9.1 requests-toolbelt==0.9.1
requests[security]==2.22.0 requests[security]==2.22.0
retrying==1.3.3 retrying==1.3.3
s3transfer==0.2.1 s3transfer==0.2.1
six==1.12.0 six==1.13.0
snowballstemmer==2.0.0 # via sphinx snowballstemmer==2.0.0 # via sphinx
sphinx-rtd-theme==0.4.3 sphinx-rtd-theme==0.4.3
sphinx==2.2.0 sphinx==2.3.1
sphinxcontrib-applehelp==1.0.1 # via sphinx sphinxcontrib-applehelp==1.0.1 # via sphinx
sphinxcontrib-devhelp==1.0.1 # via sphinx sphinxcontrib-devhelp==1.0.1 # via sphinx
sphinxcontrib-htmlhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==1.0.2 # via sphinx
@ -99,14 +100,15 @@ sphinxcontrib-httpdomain==1.7.0
sphinxcontrib-jsmath==1.0.1 # via sphinx sphinxcontrib-jsmath==1.0.1 # via sphinx
sphinxcontrib-qthelp==1.0.2 # via sphinx sphinxcontrib-qthelp==1.0.2 # via sphinx
sphinxcontrib-serializinghtml==1.1.3 # via sphinx sphinxcontrib-serializinghtml==1.1.3 # via sphinx
sqlalchemy-utils==0.34.2 sqlalchemy-utils==0.36.1
sqlalchemy==1.3.10 sqlalchemy==1.3.12
tabulate==0.8.5 tabulate==0.8.6
twofish==0.3.0 twofish==0.3.0
urllib3==1.25.6 urllib3==1.25.7
vine==1.3.0 vine==1.3.0
werkzeug==0.16.0 werkzeug==0.16.0
xmltodict==0.12.0 xmltodict==0.12.0
zipp==0.6.0
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
# setuptools==41.4.0 # via acme, josepy, sphinx # setuptools

81
requirements-tests.txt
View File

@ -5,37 +5,34 @@
# pip-compile --no-index --output-file=requirements-tests.txt requirements-tests.in # pip-compile --no-index --output-file=requirements-tests.txt requirements-tests.in
# #
appdirs==1.4.3 # via black appdirs==1.4.3 # via black
asn1crypto==1.1.0 # via cryptography
atomicwrites==1.3.0 # via pytest
attrs==19.3.0 # via black, jsonschema, pytest attrs==19.3.0 # via black, jsonschema, pytest
aws-sam-translator==1.15.1 # via cfn-lint aws-sam-translator==1.19.1 # via cfn-lint
aws-xray-sdk==2.4.2 # via moto aws-xray-sdk==2.4.3 # via moto
bandit==1.6.2 bandit==1.6.2
black==19.3b0 black==19.10b0
boto3==1.9.250 # via aws-sam-translator, moto boto3==1.10.46 # via aws-sam-translator, moto
boto==2.49.0 # via moto boto==2.49.0 # via moto
botocore==1.12.250 # via aws-xray-sdk, boto3, moto, s3transfer botocore==1.13.46 # via aws-xray-sdk, boto3, moto, s3transfer
certifi==2019.9.11 # via requests certifi==2019.11.28 # via requests
cffi==1.13.0 # via cryptography cffi==1.13.2 # via cryptography
cfn-lint==0.24.4 # via moto cfn-lint==0.26.2 # via moto
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
click==7.0 # via black, flask click==7.0 # via black, flask
coverage==4.5.4 coverage==5.0.1
cryptography==2.7 # via moto, sshpubkeys cryptography==2.8 # via moto, sshpubkeys
datetime==4.3 # via moto
docker==4.1.0 # via moto docker==4.1.0 # via moto
docutils==0.15.2 # via botocore docutils==0.15.2 # via botocore
ecdsa==0.13.3 # via python-jose, sshpubkeys ecdsa==0.15 # via python-jose, sshpubkeys
factory-boy==2.12.0 factory-boy==2.12.0
faker==2.0.3 faker==3.0.0
fakeredis==1.0.5 fakeredis==1.1.0
flask==1.1.1 # via pytest-flask flask==1.1.1 # via pytest-flask
freezegun==0.3.12 freezegun==0.3.12
future==0.18.0 # via aws-xray-sdk, python-jose future==0.18.2 # via aws-xray-sdk
gitdb2==2.0.6 # via gitpython gitdb2==2.0.6 # via gitpython
gitpython==3.0.3 # via bandit gitpython==3.0.5 # via bandit
idna==2.8 # via moto, requests idna==2.8 # via moto, requests
importlib-metadata==0.23 # via jsonschema, pluggy, pytest importlib-metadata==1.3.0 # via jsonschema, pluggy, pytest
itsdangerous==1.1.0 # via flask itsdangerous==1.1.0 # via flask
jinja2==2.10.3 # via flask, moto jinja2==2.10.3 # via flask, moto
jmespath==0.9.4 # via boto3, botocore jmespath==0.9.4 # via boto3, botocore
@ -43,49 +40,51 @@ jsondiff==1.1.2 # via moto
jsonpatch==1.24 # via cfn-lint jsonpatch==1.24 # via cfn-lint
jsonpickle==1.2 # via aws-xray-sdk jsonpickle==1.2 # via aws-xray-sdk
jsonpointer==2.0 # via jsonpatch jsonpointer==2.0 # via jsonpatch
jsonschema==3.1.1 # via aws-sam-translator, cfn-lint jsonschema==3.2.0 # via aws-sam-translator, cfn-lint
markupsafe==1.1.1 # via jinja2 markupsafe==1.1.1 # via jinja2
mock==3.0.5 # via moto mock==3.0.5 # via moto
more-itertools==7.2.0 # via pytest, zipp more-itertools==8.0.2 # via pytest, zipp
moto==1.3.13 moto==1.3.14
nose==1.3.7 nose==1.3.7
packaging==19.2 # via pytest packaging==19.2 # via pytest
pbr==5.4.3 # via stevedore pathspec==0.7.0 # via black
pluggy==0.13.0 # via pytest pbr==5.4.4 # via stevedore
py==1.8.0 # via pytest pluggy==0.13.1 # via pytest
pyasn1==0.4.7 # via rsa py==1.8.1 # via pytest
pyasn1==0.4.8 # via python-jose, rsa
pycparser==2.19 # via cffi pycparser==2.19 # via cffi
pyflakes==2.1.1 pyflakes==2.1.1
pyparsing==2.4.2 # via packaging pyparsing==2.4.6 # via packaging
pyrsistent==0.15.4 # via jsonschema pyrsistent==0.15.6 # via jsonschema
pytest-flask==0.15.0 pytest-flask==0.15.0
pytest-mock==1.11.1 pytest-mock==1.13.0
pytest==5.2.1 pytest==5.3.2
python-dateutil==2.8.0 # via botocore, faker, freezegun, moto python-dateutil==2.8.1 # via botocore, faker, freezegun, moto
python-jose==3.0.1 # via moto python-jose==3.1.0 # via moto
pytz==2019.3 # via datetime, moto pytz==2019.3 # via moto
pyyaml==5.1.2 pyyaml==5.2
redis==3.3.11 # via fakeredis redis==3.3.11 # via fakeredis
regex==2019.12.20 # via black
requests-mock==1.7.0 requests-mock==1.7.0
requests==2.22.0 # via docker, moto, requests-mock, responses requests==2.22.0 # via docker, moto, requests-mock, responses
responses==0.10.6 # via moto responses==0.10.9 # via moto
rsa==4.0 # via python-jose rsa==4.0 # via python-jose
s3transfer==0.2.1 # via boto3 s3transfer==0.2.1 # via boto3
six==1.12.0 # via aws-sam-translator, bandit, cfn-lint, cryptography, docker, faker, fakeredis, freezegun, jsonschema, mock, moto, packaging, pyrsistent, python-dateutil, python-jose, requests-mock, responses, stevedore, websocket-client six==1.13.0 # via aws-sam-translator, bandit, cfn-lint, cryptography, docker, ecdsa, faker, fakeredis, freezegun, jsonschema, mock, moto, packaging, pyrsistent, python-dateutil, python-jose, requests-mock, responses, stevedore, websocket-client
smmap2==2.0.5 # via gitdb2 smmap2==2.0.5 # via gitdb2
sortedcontainers==2.1.0 # via fakeredis sortedcontainers==2.1.0 # via fakeredis
sshpubkeys==3.1.0 # via moto sshpubkeys==3.1.0 # via moto
stevedore==1.31.0 # via bandit stevedore==1.31.0 # via bandit
text-unidecode==1.3 # via faker text-unidecode==1.3 # via faker
toml==0.10.0 # via black toml==0.10.0 # via black
urllib3==1.25.6 # via botocore, requests typed-ast==1.4.0 # via black
wcwidth==0.1.7 # via pytest urllib3==1.25.7 # via botocore, requests
websocket-client==0.56.0 # via docker wcwidth==0.1.8 # via pytest
websocket-client==0.57.0 # via docker
werkzeug==0.16.0 # via flask, moto, pytest-flask werkzeug==0.16.0 # via flask, moto, pytest-flask
wrapt==1.11.2 # via aws-xray-sdk wrapt==1.11.2 # via aws-xray-sdk
xmltodict==0.12.0 # via moto xmltodict==0.12.0 # via moto
zipp==0.6.0 # via importlib-metadata zipp==0.6.0 # via importlib-metadata
zope.interface==4.6.0 # via datetime
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
# setuptools==41.4.0 # via cfn-lint, jsonschema, zope.interface # setuptools

1
requirements.in
View File

@ -28,7 +28,6 @@ gunicorn
hvac # required for the vault destination plugin hvac # required for the vault destination plugin
inflection inflection
jinja2 jinja2
kombu<4.6.0 # Bug with inspecting active tasks: https://github.com/celery/kombu/issues/1051
lockfile lockfile
logmatic-python logmatic-python
marshmallow-sqlalchemy marshmallow-sqlalchemy

64
requirements.txt
View File

@ -4,27 +4,26 @@
# #
# pip-compile --no-index --output-file=requirements.txt requirements.in # pip-compile --no-index --output-file=requirements.txt requirements.in
# #
acme==0.39.0 acme==1.0.0
alembic-autogenerate-enums==0.0.2 alembic-autogenerate-enums==0.0.2
alembic==1.2.1 # via flask-migrate alembic==1.3.2 # via flask-migrate
amqp==2.5.2 # via kombu amqp==2.5.2 # via kombu
aniso8601==8.0.0 # via flask-restful aniso8601==8.0.0 # via flask-restful
arrow==0.15.2 arrow==0.15.5
asn1crypto==1.1.0 # via cryptography
asyncpool==1.0 asyncpool==1.0
bcrypt==3.1.7 # via flask-bcrypt, paramiko bcrypt==3.1.7 # via flask-bcrypt, paramiko
billiard==3.6.1.0 # via celery billiard==3.6.1.0 # via celery
blinker==1.4 # via flask-mail, flask-principal, raven blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.9.250 boto3==1.10.46
botocore==1.12.250 botocore==1.13.46
celery[redis]==4.3.0 celery[redis]==4.4.0
certifi==2019.9.11 certifi==2019.11.28
certsrv==2.1.1 certsrv==2.1.1
cffi==1.13.0 # via bcrypt, cryptography, pynacl cffi==1.13.2 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests chardet==3.0.4 # via requests
click==7.0 # via flask click==7.0 # via flask
cloudflare==2.3.0 cloudflare==2.3.1
cryptography==2.7 cryptography==2.8
dnspython3==1.15.0 dnspython3==1.15.0
dnspython==1.15.0 # via dnspython3 dnspython==1.15.0 # via dnspython3
docutils==0.15.2 # via botocore docutils==0.15.2 # via botocore
@ -39,59 +38,62 @@ flask-restful==0.3.7
flask-script==2.0.6 flask-script==2.0.6
flask-sqlalchemy==2.4.1 flask-sqlalchemy==2.4.1
flask==1.1.1 flask==1.1.1
future==0.18.0 future==0.18.2
gunicorn==19.9.0 gunicorn==20.0.4
hvac==0.9.5 hvac==0.9.6
idna==2.8 # via requests idna==2.8 # via requests
importlib-metadata==1.3.0 # via kombu
inflection==0.3.1 inflection==0.3.1
itsdangerous==1.1.0 # via flask itsdangerous==1.1.0 # via flask
javaobj-py3==0.3.0 # via pyjks javaobj-py3==0.4.0.1 # via pyjks
jinja2==2.10.3 jinja2==2.10.3
jmespath==0.9.4 # via boto3, botocore jmespath==0.9.4 # via boto3, botocore
josepy==1.2.0 # via acme josepy==1.2.0 # via acme
jsonlines==1.2.0 # via cloudflare jsonlines==1.2.0 # via cloudflare
kombu==4.5.0 kombu==4.6.7 # via celery
lockfile==0.12.2 lockfile==0.12.2
logmatic-python==0.1.7 logmatic-python==0.1.7
mako==1.1.0 # via alembic mako==1.1.0 # via alembic
markupsafe==1.1.1 # via jinja2, mako markupsafe==1.1.1 # via jinja2, mako
marshmallow-sqlalchemy==0.19.0 marshmallow-sqlalchemy==0.21.0
marshmallow==2.20.4 marshmallow==2.20.4
mock==3.0.5 # via acme mock==3.0.5 # via acme
more-itertools==8.0.2 # via zipp
ndg-httpsclient==0.5.1 ndg-httpsclient==0.5.1
paramiko==2.6.0 paramiko==2.7.1
pem==19.2.0 pem==19.3.0
psycopg2==2.8.3 psycopg2==2.8.4
pyasn1-modules==0.2.7 # via pyjks, python-ldap pyasn1-modules==0.2.7 # via pyjks, python-ldap
pyasn1==0.4.7 # via ndg-httpsclient, pyasn1-modules, pyjks, python-ldap pyasn1==0.4.8 # via ndg-httpsclient, pyasn1-modules, pyjks, python-ldap
pycparser==2.19 # via cffi pycparser==2.19 # via cffi
pycryptodomex==3.9.0 # via pyjks pycryptodomex==3.9.4 # via pyjks
pyjks==19.0.0 pyjks==19.0.0
pyjwt==1.7.1 pyjwt==1.7.1
pynacl==1.3.0 # via paramiko pynacl==1.3.0 # via paramiko
pyopenssl==19.0.0 pyopenssl==19.1.0
pyrfc3339==1.1 # via acme pyrfc3339==1.1 # via acme
python-dateutil==2.8.0 # via alembic, arrow, botocore python-dateutil==2.8.1 # via alembic, arrow, botocore
python-editor==1.0.4 # via alembic python-editor==1.0.4 # via alembic
python-json-logger==0.1.11 # via logmatic-python python-json-logger==0.1.11 # via logmatic-python
python-ldap==3.2.0 python-ldap==3.2.0
pytz==2019.3 # via acme, celery, flask-restful, pyrfc3339 pytz==2019.3 # via acme, celery, flask-restful, pyrfc3339
pyyaml==5.1.2 pyyaml==5.2
raven[flask]==6.10.0 raven[flask]==6.10.0
redis==3.3.11 redis==3.3.11
requests-toolbelt==0.9.1 # via acme requests-toolbelt==0.9.1 # via acme
requests[security]==2.22.0 requests[security]==2.22.0
retrying==1.3.3 retrying==1.3.3
s3transfer==0.2.1 # via boto3 s3transfer==0.2.1 # via boto3
six==1.12.0 six==1.13.0
sqlalchemy-utils==0.34.2 sqlalchemy-utils==0.36.1
sqlalchemy==1.3.10 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils sqlalchemy==1.3.12 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
tabulate==0.8.5 tabulate==0.8.6
twofish==0.3.0 # via pyjks twofish==0.3.0 # via pyjks
urllib3==1.25.6 # via botocore, requests urllib3==1.25.7 # via botocore, requests
vine==1.3.0 # via amqp, celery vine==1.3.0 # via amqp, celery
werkzeug==0.16.0 # via flask werkzeug==0.16.0 # via flask
xmltodict==0.12.0 xmltodict==0.12.0
zipp==0.6.0 # via importlib-metadata
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
# setuptools==41.4.0 # via acme, josepy # setuptools