Skip to content

Commit

Permalink
Merge branch 'master' into crt-sh-link
Browse files Browse the repository at this point in the history
  • Loading branch information
castrapel committed Aug 27, 2018
2 parents 7ad2404 + dee9bbd commit 9d56ae3
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 18 deletions.
4 changes: 2 additions & 2 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
aspy.yaml==1.1.1 # via pre-commit
cached-property==1.4.3 # via pre-commit
certifi==2018.8.13 # via requests
certifi==2018.8.24 # via requests
cfgv==1.1.0 # via pre-commit
chardet==3.0.4 # via requests
flake8==3.5.0
Expand All @@ -24,7 +24,7 @@ requests-toolbelt==0.8.0 # via twine
requests==2.19.1 # via requests-toolbelt, twine
six==1.11.0 # via cfgv, pre-commit
toml==0.9.4 # via pre-commit
tqdm==4.24.0 # via twine
tqdm==4.25.0 # via twine
twine==1.11.0
urllib3==1.23 # via requests
virtualenv==16.0.0 # via pre-commit
8 changes: 4 additions & 4 deletions requirements-docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ asyncpool==1.0
babel==2.6.0 # via sphinx
bcrypt==3.1.4
blinker==1.4
boto3==1.7.79
botocore==1.10.79
certifi==2018.8.13
boto3==1.8.1
botocore==1.11.1
certifi==2018.8.24
cffi==1.11.5
chardet==3.0.4
click==6.7
Expand Down Expand Up @@ -79,7 +79,7 @@ s3transfer==0.1.13
six==1.11.0
snowballstemmer==1.2.1 # via sphinx
sphinx-rtd-theme==0.4.1
sphinx==1.7.6
sphinx==1.7.7
sphinxcontrib-httpdomain==1.7.0
sphinxcontrib-websupport==1.1.0 # via sphinx
sqlalchemy-utils==0.33.3
Expand Down
14 changes: 7 additions & 7 deletions requirements-tests.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
# pip-compile --no-index --output-file requirements-tests.txt requirements-tests.in
#
asn1crypto==0.24.0 # via cryptography
atomicwrites==1.1.5 # via pytest
atomicwrites==1.2.0 # via pytest
attrs==18.1.0 # via pytest
aws-xray-sdk==0.95 # via moto
boto3==1.7.79 # via moto
boto3==1.8.1 # via moto
boto==2.49.0 # via moto
botocore==1.10.79 # via boto3, moto, s3transfer
certifi==2018.8.13 # via requests
botocore==1.11.1 # via boto3, moto, s3transfer
certifi==2018.8.24 # via requests
cffi==1.11.5 # via cryptography
chardet==3.0.4 # via requests
click==6.7 # via flask
Expand Down Expand Up @@ -47,7 +47,7 @@ pycryptodome==3.6.6 # via python-jose
pyflakes==2.0.0
pytest-flask==0.10.0
pytest-mock==1.10.0
pytest==3.7.1
pytest==3.7.3
python-dateutil==2.7.3 # via botocore, faker, freezegun, moto
python-jose==2.0.2 # via moto
pytz==2018.5 # via moto
Expand All @@ -58,8 +58,8 @@ responses==0.9.0 # via moto
s3transfer==0.1.13 # via boto3
six==1.11.0 # via cryptography, docker, docker-pycreds, faker, freezegun, mock, more-itertools, moto, pytest, python-dateutil, python-jose, requests-mock, responses, websocket-client
text-unidecode==1.2 # via faker
urllib3==1.23 # via requests
websocket-client==0.49.0 # via docker
urllib3==1.23 # via botocore, requests
websocket-client==0.51.0 # via docker
werkzeug==0.14.1 # via flask, moto, pytest-flask
wrapt==1.10.11 # via aws-xray-sdk
xmltodict==0.11.0 # via moto
4 changes: 2 additions & 2 deletions requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ acme
alembic-autogenerate-enums
arrow
asyncpool
boto3
boto3==1.7.79
certifi
CloudFlare
cryptography
Expand Down Expand Up @@ -39,4 +39,4 @@ retrying
six
SQLAlchemy-Utils
tabulate
xmltodict
xmltodict
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ asyncpool==1.0
bcrypt==3.1.4 # via flask-bcrypt, paramiko
blinker==1.4 # via flask-mail, flask-principal, raven
boto3==1.7.79
botocore==1.10.79 # via boto3, s3transfer
certifi==2018.8.13
botocore==1.10.84 # via boto3, s3transfer
certifi==2018.8.24
cffi==1.11.5 # via bcrypt, cryptography, pynacl
chardet==3.0.4 # via requests
click==6.7 # via flask
Expand Down Expand Up @@ -73,7 +73,7 @@ retrying==1.3.3
s3transfer==0.1.13 # via boto3
six==1.11.0
sqlalchemy-utils==0.33.3
sqlalchemy==1.2.10 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
sqlalchemy==1.2.11 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils
tabulate==0.8.2
urllib3==1.23 # via requests
werkzeug==0.14.1 # via flask
Expand Down

0 comments on commit 9d56ae3

Please sign in to comment.