Merge branch 'master' into jwks_validation_error_control

This commit is contained in:
Hossein Shafagh 2019-05-06 16:57:03 -07:00 committed by GitHub
commit 298d172536
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 21 deletions

View File

@ -18,7 +18,7 @@ invoke==1.2.0
mccabe==0.6.1 # via flake8
nodeenv==1.3.3
pkginfo==1.5.0.1 # via twine
pre-commit==1.15.2
pre-commit==1.16.0
pycodestyle==2.3.1 # via flake8
pyflakes==1.6.0 # via flake8
pygments==2.3.1 # via readme-renderer
@ -30,7 +30,7 @@ six==1.12.0 # via bleach, cfgv, pre-commit, readme-renderer
toml==0.10.0 # via pre-commit
tqdm==4.31.1 # via twine
twine==1.13.0
urllib3==1.24.2 # via requests
urllib3==1.24.3 # via requests
virtualenv==16.5.0 # via pre-commit
webencodings==0.5.1 # via bleach
zipp==0.4.0 # via importlib-metadata

View File

@ -4,7 +4,7 @@
#
# pip-compile --output-file requirements-docs.txt requirements-docs.in -U --no-index
#
acme==0.33.1
acme==0.34.1
alabaster==0.7.12 # via sphinx
alembic-autogenerate-enums==0.0.2
alembic==1.0.10
@ -17,8 +17,8 @@ babel==2.6.0 # via sphinx
bcrypt==3.1.6
billiard==3.6.0.0
blinker==1.4
boto3==1.9.138
botocore==1.12.138
boto3==1.9.143
botocore==1.12.143
celery[redis]==4.3.0
certifi==2019.3.9
certsrv==2.1.1
@ -56,13 +56,12 @@ kombu==4.5.0
lockfile==0.12.2
mako==1.0.9
markupsafe==1.1.1
marshmallow-sqlalchemy==0.16.2
marshmallow-sqlalchemy==0.16.3
marshmallow==2.19.2
mock==2.0.0
mock==3.0.4
ndg-httpsclient==0.5.1
packaging==19.0 # via sphinx
paramiko==2.4.2
pbr==5.2.0
pem==19.1.0
psycopg2==2.8.2
pyasn1-modules==0.2.5
@ -101,7 +100,7 @@ sqlalchemy-utils==0.33.11
sqlalchemy==1.3.3
tabulate==0.8.3
twofish==0.3.0
urllib3==1.24.2
urllib3==1.24.3
vine==1.3.0
werkzeug==0.15.2
xmltodict==0.12.0

View File

@ -9,9 +9,9 @@ atomicwrites==1.3.0 # via pytest
attrs==19.1.0 # via pytest
aws-sam-translator==1.11.0 # via cfn-lint
aws-xray-sdk==2.4.2 # via moto
boto3==1.9.138 # via aws-sam-translator, moto
boto3==1.9.143 # via aws-sam-translator, moto
boto==2.49.0 # via moto
botocore==1.12.138 # via aws-xray-sdk, boto3, moto, s3transfer
botocore==1.12.143 # 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
@ -38,11 +38,10 @@ 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
mock==3.0.4 # via moto
more-itertools==7.0.0 # via pytest
moto==1.3.8
nose==1.3.7
pbr==5.2.0 # via mock
pluggy==0.9.0 # via pytest
py==1.8.0 # via pytest
pyasn1==0.4.5 # via rsa
@ -62,7 +61,7 @@ rsa==4.0 # via python-jose
s3transfer==0.2.0 # via boto3
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
urllib3==1.24.3 # via botocore, requests
websocket-client==0.56.0 # via docker
werkzeug==0.15.2 # via flask, moto, pytest-flask
wrapt==1.11.1 # via aws-xray-sdk

View File

@ -4,7 +4,7 @@
#
# pip-compile --output-file requirements.txt requirements.in -U --no-index
#
acme==0.33.1
acme==0.34.1
alembic-autogenerate-enums==0.0.2
alembic==1.0.10 # via flask-migrate
amqp==2.4.2 # via kombu
@ -15,8 +15,8 @@ asyncpool==1.0
bcrypt==3.1.6 # via flask-bcrypt, paramiko
billiard==3.6.0.0 # via celery
blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.9.138
botocore==1.12.138
boto3==1.9.143
botocore==1.12.143
celery[redis]==4.3.0
certifi==2019.3.9
certsrv==2.1.1
@ -53,12 +53,11 @@ kombu==4.5.0
lockfile==0.12.2
mako==1.0.9 # via alembic
markupsafe==1.1.1 # via jinja2, mako
marshmallow-sqlalchemy==0.16.2
marshmallow-sqlalchemy==0.16.3
marshmallow==2.19.2
mock==2.0.0 # via acme
mock==3.0.4 # via acme
ndg-httpsclient==0.5.1
paramiko==2.4.2
pbr==5.2.0 # via mock
pem==19.1.0
psycopg2==2.8.2
pyasn1-modules==0.2.5 # via pyjks, python-ldap
@ -86,7 +85,7 @@ 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
urllib3==1.24.3 # via botocore, requests
vine==1.3.0 # via amqp, celery
werkzeug==0.15.2 # via flask
xmltodict==0.12.0