From de0b4ddc99246dc91740349633dd48eea2a6141b Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Tue, 20 Mar 2018 15:43:25 -0700 Subject: [PATCH 01/10] unpin flask in requirements.in --- requirements.in | 2 +- requirements.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 4f08d318..5e283b4b 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ Flask==0.12 Flask-RESTful==0.3.6 -Flask-SQLAlchemy==2.1 +Flask-SQLAlchemy>2,<3 Flask-Script==2.0.6 Flask-Migrate==2.1.1 Flask-Bcrypt==0.7.1 diff --git a/requirements.txt b/requirements.txt index abc6ed54..68c83090 100644 --- a/requirements.txt +++ b/requirements.txt @@ -134,8 +134,9 @@ flask-restful==0.3.6 \ --hash=sha256:e2f1b8063de3944b94c7f8be5cee4d2161db0267c54c5b757d875295061776fa flask-script==2.0.6 \ --hash=sha256:6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65 -flask-sqlalchemy==2.1 \ - --hash=sha256:c5244de44cc85d2267115624d83faef3f9e8f088756788694f305a5d5ad137c5 +flask-sqlalchemy==2.3.2 \ + --hash=sha256:3bc0fac969dd8c0ace01b32060f0c729565293302f0c4269beed154b46bec50b \ + --hash=sha256:5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53 flask==0.12 \ --hash=sha256:7f03bb2c255452444f7265eddb51601806e5447b6f8a2d50bbc77a654a14c118 \ --hash=sha256:93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b From 48d9a3ec8a06a6157431f8e80c8b188af220c829 Mon Sep 17 00:00:00 2001 From: cjwaian Date: Tue, 20 Mar 2018 16:54:30 -0700 Subject: [PATCH 02/10] Remove non-ASCII character (#1104) --- lemur/common/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/common/defaults.py b/lemur/common/defaults.py index bb49c5b7..3eba7be0 100644 --- a/lemur/common/defaults.py +++ b/lemur/common/defaults.py @@ -10,7 +10,7 @@ from lemur.constants import SAN_NAMING_TEMPLATE, DEFAULT_NAMING_TEMPLATE def text_to_slug(value): """Normalize a string to a "slug" value, stripping character accents and removing non-alphanum characters.""" - # Strip all character accents (ä => a): decompose Unicode characters and then drop combining chars. + # Strip all character accents: decompose Unicode characters and then drop combining chars. value = ''.join(c for c in unicodedata.normalize('NFKD', value) if not unicodedata.combining(c)) # Replace all remaining non-alphanumeric characters with '-'. Multiple characters get collapsed into a single dash. From 08f66df8606a3d1f2624f68663199caac7927d04 Mon Sep 17 00:00:00 2001 From: iTitou Date: Wed, 21 Mar 2018 16:14:54 +0100 Subject: [PATCH 03/10] [fix] No internal server error when trying to Google Auth an unregistered user (#1109) --- lemur/auth/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/auth/views.py b/lemur/auth/views.py index ce38d5d8..60f4e246 100644 --- a/lemur/auth/views.py +++ b/lemur/auth/views.py @@ -433,7 +433,7 @@ class Google(Resource): user = user_service.get_by_email(profile['email']) - if not user.active: + if not (user and user.active): metrics.send('login', 'counter', 1, metric_tags={'status': FAILURE_METRIC_STATUS}) return dict(message='The supplied credentials are invalid.'), 403 From d44a1934feb822ee16dcf53aa7cd85d59b4afc34 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Wed, 21 Mar 2018 10:29:08 -0700 Subject: [PATCH 04/10] Update auth keys, change python version to satisfy tests --- lemur/tests/vectors.py | 4 ++-- requirements-dev.txt | 10 +++++----- requirements.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lemur/tests/vectors.py b/lemur/tests/vectors.py index 9572ba66..0c4c732f 100644 --- a/lemur/tests/vectors.py +++ b/lemur/tests/vectors.py @@ -1,13 +1,13 @@ from lemur.common.utils import parse_certificate VALID_USER_HEADER_TOKEN = { - 'Authorization': 'Basic ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE0MzUyMzMzNjksInN1YiI6MSwiZXhwIjoxNTIxNTQ2OTY5fQ.1qCi0Ip7mzKbjNh0tVd3_eJOrae3rNa_9MCVdA4WtQI', + 'Authorization': 'Basic ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MjE2NTIwMjIsImV4cCI6MjM4NTY1MjAyMiwic3ViIjoxfQ.uK4PZjVAs0gt6_9h2EkYkKd64nFXdOq-rHsJZzeQicc', 'Content-Type': 'application/json' } VALID_ADMIN_HEADER_TOKEN = { - 'Authorization': 'Basic ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE0MzUyNTAyMTgsInN1YiI6MiwiZXhwIjoxNTIxNTYzODE4fQ.6mbq4-Ro6K5MmuNiTJBB153RDhlM5LGJBjI7GBKkfqA', + 'Authorization': 'Basic ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1MjE2NTE2NjMsInN1YiI6MiwiYWlkIjoxfQ.wyf5PkQNcggLrMFqxDfzjY-GWPw_XsuWvU2GmQaC5sg', 'Content-Type': 'application/json' } diff --git a/requirements-dev.txt b/requirements-dev.txt index 22bc2bbb..66d1e9ea 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -43,8 +43,8 @@ mccabe==0.6.1 \ --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \ --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f \ # via flake8 -nodeenv==1.2.0 \ - --hash=sha256:98835dab727f94a713eacc7234e3db6777a55cafb60f391485011899e5c818df \ +nodeenv==1.3.0 \ + --hash=sha256:dd0a34001090ff042cfdb4b0c8d6a6f7ec9baa49733f00b695bb8a8b4700ba6c \ # via pre-commit pkginfo==1.4.2 \ --hash=sha256:5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474 \ @@ -87,9 +87,9 @@ tqdm==4.19.8 \ --hash=sha256:05e991ecb0f874046ddcb374396a626afd046fb4d31f73633ea752b844458a7a \ --hash=sha256:2aea9f81fdf127048667e0ba22f5fc10ebc879fb838dc52dcf055242037ec1f7 \ # via twine -twine==1.10.0 \ - --hash=sha256:c3540f2b98667698412b0dc9f5e40c8c1a08a9e79e255c9c21339105eb4ca57a \ - --hash=sha256:eff86e20fdffef8abb0b638784c62d0348dac4c80380907e39b732c56e9192fb +twine==1.11.0 \ + --hash=sha256:08eb132bbaec40c6d25b358f546ec1dc96ebd2638a86eea68769d9e67fe2b129 \ + --hash=sha256:2fd9a4d9ff0bcacf41fdc40c8cb0cfaef1f1859457c9653fd1b92237cc4e9f25 urllib3==1.22 \ --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \ --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f \ diff --git a/requirements.in b/requirements.in index 5e283b4b..00076194 100644 --- a/requirements.in +++ b/requirements.in @@ -30,5 +30,5 @@ pem==17.1.0 raven[flask]==6.2.1 jinja2==2.10 paramiko==2.4.1 # required for lemur_linuxdst plugin -pyldap==3.0.0 # required by ldap auth provider +python_ldap<=3.0.0b4 alembic-autogenerate-enums==0.0.2 From f05d1750eeeb3eb1e5125afb98e8d433adb1eb95 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Tue, 20 Mar 2018 15:43:25 -0700 Subject: [PATCH 05/10] unpin flask in requirements.in --- requirements.in | 2 +- requirements.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements.in b/requirements.in index 4f08d318..5e283b4b 100644 --- a/requirements.in +++ b/requirements.in @@ -1,6 +1,6 @@ Flask==0.12 Flask-RESTful==0.3.6 -Flask-SQLAlchemy==2.1 +Flask-SQLAlchemy>2,<3 Flask-Script==2.0.6 Flask-Migrate==2.1.1 Flask-Bcrypt==0.7.1 diff --git a/requirements.txt b/requirements.txt index abc6ed54..68c83090 100644 --- a/requirements.txt +++ b/requirements.txt @@ -134,8 +134,9 @@ flask-restful==0.3.6 \ --hash=sha256:e2f1b8063de3944b94c7f8be5cee4d2161db0267c54c5b757d875295061776fa flask-script==2.0.6 \ --hash=sha256:6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65 -flask-sqlalchemy==2.1 \ - --hash=sha256:c5244de44cc85d2267115624d83faef3f9e8f088756788694f305a5d5ad137c5 +flask-sqlalchemy==2.3.2 \ + --hash=sha256:3bc0fac969dd8c0ace01b32060f0c729565293302f0c4269beed154b46bec50b \ + --hash=sha256:5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53 flask==0.12 \ --hash=sha256:7f03bb2c255452444f7265eddb51601806e5447b6f8a2d50bbc77a654a14c118 \ --hash=sha256:93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b From 19cf8f6bddb6d62afe82faab81027e1651071937 Mon Sep 17 00:00:00 2001 From: cjwaian Date: Tue, 20 Mar 2018 16:54:30 -0700 Subject: [PATCH 06/10] Remove non-ASCII character (#1104) --- lemur/common/defaults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/common/defaults.py b/lemur/common/defaults.py index bb49c5b7..3eba7be0 100644 --- a/lemur/common/defaults.py +++ b/lemur/common/defaults.py @@ -10,7 +10,7 @@ from lemur.constants import SAN_NAMING_TEMPLATE, DEFAULT_NAMING_TEMPLATE def text_to_slug(value): """Normalize a string to a "slug" value, stripping character accents and removing non-alphanum characters.""" - # Strip all character accents (ä => a): decompose Unicode characters and then drop combining chars. + # Strip all character accents: decompose Unicode characters and then drop combining chars. value = ''.join(c for c in unicodedata.normalize('NFKD', value) if not unicodedata.combining(c)) # Replace all remaining non-alphanumeric characters with '-'. Multiple characters get collapsed into a single dash. From bbacb7e210820574ca3e2211a4199db25dfaf7ec Mon Sep 17 00:00:00 2001 From: iTitou Date: Wed, 21 Mar 2018 16:14:54 +0100 Subject: [PATCH 07/10] [fix] No internal server error when trying to Google Auth an unregistered user (#1109) --- lemur/auth/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lemur/auth/views.py b/lemur/auth/views.py index ce38d5d8..60f4e246 100644 --- a/lemur/auth/views.py +++ b/lemur/auth/views.py @@ -433,7 +433,7 @@ class Google(Resource): user = user_service.get_by_email(profile['email']) - if not user.active: + if not (user and user.active): metrics.send('login', 'counter', 1, metric_tags={'status': FAILURE_METRIC_STATUS}) return dict(message='The supplied credentials are invalid.'), 403 From 4087f1c03b22b22839529bc31f4094594fa871d2 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Wed, 21 Mar 2018 10:29:08 -0700 Subject: [PATCH 08/10] Update auth keys, change python version to satisfy tests --- lemur/tests/vectors.py | 4 ++-- requirements-dev.txt | 10 +++++----- requirements.in | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lemur/tests/vectors.py b/lemur/tests/vectors.py index 9572ba66..0c4c732f 100644 --- a/lemur/tests/vectors.py +++ b/lemur/tests/vectors.py @@ -1,13 +1,13 @@ from lemur.common.utils import parse_certificate VALID_USER_HEADER_TOKEN = { - 'Authorization': 'Basic ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE0MzUyMzMzNjksInN1YiI6MSwiZXhwIjoxNTIxNTQ2OTY5fQ.1qCi0Ip7mzKbjNh0tVd3_eJOrae3rNa_9MCVdA4WtQI', + 'Authorization': 'Basic ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE1MjE2NTIwMjIsImV4cCI6MjM4NTY1MjAyMiwic3ViIjoxfQ.uK4PZjVAs0gt6_9h2EkYkKd64nFXdOq-rHsJZzeQicc', 'Content-Type': 'application/json' } VALID_ADMIN_HEADER_TOKEN = { - 'Authorization': 'Basic ' + 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpYXQiOjE0MzUyNTAyMTgsInN1YiI6MiwiZXhwIjoxNTIxNTYzODE4fQ.6mbq4-Ro6K5MmuNiTJBB153RDhlM5LGJBjI7GBKkfqA', + 'Authorization': 'Basic ' + 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpYXQiOjE1MjE2NTE2NjMsInN1YiI6MiwiYWlkIjoxfQ.wyf5PkQNcggLrMFqxDfzjY-GWPw_XsuWvU2GmQaC5sg', 'Content-Type': 'application/json' } diff --git a/requirements-dev.txt b/requirements-dev.txt index 22bc2bbb..66d1e9ea 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -43,8 +43,8 @@ mccabe==0.6.1 \ --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \ --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f \ # via flake8 -nodeenv==1.2.0 \ - --hash=sha256:98835dab727f94a713eacc7234e3db6777a55cafb60f391485011899e5c818df \ +nodeenv==1.3.0 \ + --hash=sha256:dd0a34001090ff042cfdb4b0c8d6a6f7ec9baa49733f00b695bb8a8b4700ba6c \ # via pre-commit pkginfo==1.4.2 \ --hash=sha256:5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474 \ @@ -87,9 +87,9 @@ tqdm==4.19.8 \ --hash=sha256:05e991ecb0f874046ddcb374396a626afd046fb4d31f73633ea752b844458a7a \ --hash=sha256:2aea9f81fdf127048667e0ba22f5fc10ebc879fb838dc52dcf055242037ec1f7 \ # via twine -twine==1.10.0 \ - --hash=sha256:c3540f2b98667698412b0dc9f5e40c8c1a08a9e79e255c9c21339105eb4ca57a \ - --hash=sha256:eff86e20fdffef8abb0b638784c62d0348dac4c80380907e39b732c56e9192fb +twine==1.11.0 \ + --hash=sha256:08eb132bbaec40c6d25b358f546ec1dc96ebd2638a86eea68769d9e67fe2b129 \ + --hash=sha256:2fd9a4d9ff0bcacf41fdc40c8cb0cfaef1f1859457c9653fd1b92237cc4e9f25 urllib3==1.22 \ --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \ --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f \ diff --git a/requirements.in b/requirements.in index 5e283b4b..00076194 100644 --- a/requirements.in +++ b/requirements.in @@ -30,5 +30,5 @@ pem==17.1.0 raven[flask]==6.2.1 jinja2==2.10 paramiko==2.4.1 # required for lemur_linuxdst plugin -pyldap==3.0.0 # required by ldap auth provider +python_ldap<=3.0.0b4 alembic-autogenerate-enums==0.0.2 From d67542d7f5a335dc9ca7a6e5c5a4a6ce0525d681 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Wed, 21 Mar 2018 12:45:26 -0700 Subject: [PATCH 09/10] actually update deps --- lemur/plugins/lemur_acme/plugin.py | 3 +- requirements-dev.in | 3 +- requirements-dev.txt | 3 +- requirements-docs.txt | 6 +- requirements-tests.in | 12 +- requirements-tests.txt | 69 +++--- requirements.in | 66 ++--- requirements.txt | 378 +++++------------------------ 8 files changed, 146 insertions(+), 394 deletions(-) diff --git a/lemur/plugins/lemur_acme/plugin.py b/lemur/plugins/lemur_acme/plugin.py index 3dabc575..5bdb5514 100644 --- a/lemur/plugins/lemur_acme/plugin.py +++ b/lemur/plugins/lemur_acme/plugin.py @@ -10,10 +10,11 @@ .. moduleauthor:: Kevin Glisson .. moduleauthor:: Mikhail Khodorovskiy """ +import josepy as jose + from flask import current_app from acme.client import Client -from acme import jose from acme import messages from acme import challenges diff --git a/requirements-dev.in b/requirements-dev.in index a7319d7f..4e560267 100644 --- a/requirements-dev.in +++ b/requirements-dev.in @@ -1,4 +1,5 @@ flake8>=3.2,<4.0 pre-commit invoke -twine \ No newline at end of file +twine +nodeenv \ No newline at end of file diff --git a/requirements-dev.txt b/requirements-dev.txt index 66d1e9ea..8e3ace25 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -44,8 +44,7 @@ mccabe==0.6.1 \ --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f \ # via flake8 nodeenv==1.3.0 \ - --hash=sha256:dd0a34001090ff042cfdb4b0c8d6a6f7ec9baa49733f00b695bb8a8b4700ba6c \ - # via pre-commit + --hash=sha256:dd0a34001090ff042cfdb4b0c8d6a6f7ec9baa49733f00b695bb8a8b4700ba6c pkginfo==1.4.2 \ --hash=sha256:5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474 \ --hash=sha256:a39076cb3eb34c333a0dd390b568e9e1e881c7bf2cc0aee12120636816f55aee \ diff --git a/requirements-docs.txt b/requirements-docs.txt index a92546c0..26b7c6d9 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -71,9 +71,9 @@ snowballstemmer==1.2.1 \ sphinx-rtd-theme==0.2.4 \ --hash=sha256:2df74b8ff6fae6965c527e97cca6c6c944886aae474b490e17f92adfbe843417 \ --hash=sha256:62ee4752716e698bad7de8a18906f42d33664128eea06c46b718fc7fbd1a9f5c -sphinx==1.7.1 \ - --hash=sha256:41ae26acc6130ccf6ed47e5cca73742b80d55a134f0ab897c479bba8d3640b8e \ - --hash=sha256:da987de5fcca21a4acc7f67a86a363039e67ac3e8827161e61b91deb131c0ee8 +sphinx==1.7.2 \ + --hash=sha256:5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2 \ + --hash=sha256:7a606d77618a753adb79e13605166e3cf6a0e5678526e044236fc1ac43650910 sphinxcontrib-httpdomain==1.6.1 \ --hash=sha256:029f596deb7b4246148a8e8a7d041764d0cad545cf4f3bb6252ac90c785ab221 \ --hash=sha256:2572c10bf84fab856999667369e3604eb209d8dda7321556bfee93fddcfc33b5 diff --git a/requirements-tests.in b/requirements-tests.in index e80ba730..b2fef92a 100644 --- a/requirements-tests.in +++ b/requirements-tests.in @@ -1,10 +1,10 @@ -pyflakes -moto==1.1.25 -nose==1.3.7 -pytest==3.3.2 factory-boy==2.9.2 fake-factory==0.7.2 -pytest-flask==0.10.0 freezegun==0.3.9 -requests-mock==1.4.0 +moto>1,<2 +nose==1.3.7 +pyflakes +pytest-flask==0.10.0 pytest-mock +pytest==3.3.2 +requests-mock==1.4.0 diff --git a/requirements-tests.txt b/requirements-tests.txt index cfb512d4..c2a06fc5 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -12,21 +12,21 @@ attrs==17.4.0 \ --hash=sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9 \ --hash=sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450 \ # via pytest -aws-xray-sdk==0.96 \ - --hash=sha256:0375c575c3b094580f8b4bf158437759ad6ab9f0026a50a8012d81508d7e28b9 \ - --hash=sha256:d4209bab729c861d9fe0f2a8d3979efb5dfa5f089115036a7c11902b1173312f \ +aws-xray-sdk==0.95 \ + --hash=sha256:72791618feb22eaff2e628462b0d58f398ce8c1bacfa989b7679817ab1fad60c \ + --hash=sha256:9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943 \ # via moto -boto3==1.6.11 \ - --hash=sha256:474e1333f17bb2e361555c9f98c5db57581de32f68713bfb1f8bbbb647580ecc \ - --hash=sha256:8cac0e97b9c7bf78a933644f2c801f049c5acce8f2a0105104811fab3829712e \ +boto3==1.6.12 \ + --hash=sha256:3e224b2ec4b62d3a88577eb6261fef4898d7aa5baabe58c79b7abf718fca1479 \ + --hash=sha256:a55f74e427ae26e30ee8696312e0caa57bfef58d9bf308fa4221ba2d968c8db2 \ # via moto boto==2.48.0 \ --hash=sha256:13be844158d1bd80a94c972c806ec8381b9ea72035aa06123c5db6bc6a6f3ead \ --hash=sha256:deb8925b734b109679e3de65856018996338758f4b916ff4fe7bb62b6d7000d1 \ # via moto -botocore==1.9.11 \ - --hash=sha256:38471b40c32eb20cbac8ac13b85d82d2a313f06a6a89e26fbe72160d81cb3d66 \ - --hash=sha256:5a79b44c6fa1f3befae37519add0b02307cd3425308ff8fd6793fe7a349f0c54 \ +botocore==1.9.12 \ + --hash=sha256:2797b0dd2350c2611cf22fda3ea023b8f21cf3ef3db4bf8929f34ba779adaed0 \ + --hash=sha256:54f28ec362c0ff2dfdc891835bdacdfb01770ab4973816fa37193164608ddbde \ # via boto3, moto, s3transfer certifi==2018.1.18 \ --hash=sha256:14131608ad2fd56836d33a71ee60fa1c82bc9d2c8d98b7bdbc631fe1b3cd1296 \ @@ -73,32 +73,32 @@ cookies==2.2.1 \ --hash=sha256:15bee753002dff684987b8df8c235288eb8d45f8191ae056254812dfd42c81d3 \ --hash=sha256:d6b698788cae4cfa4e62ef8643a9ca332b79bd96cb314294b864ae8d7eb3ee8e \ # via moto -cryptography==2.2 \ - --hash=sha256:0222f19fa29c609b4be4bc260db6ab9bfabca1b2626ebf97875cca21ac60d968 \ - --hash=sha256:064e820797b6992104041e74a32f912b4e4279da4e7821daa31b580de1fa910c \ - --hash=sha256:0e426fcb6e6f9100b3e3373458888cc6deb5934e6c4a26996ad720de35bce276 \ - --hash=sha256:0f11c46e22bb4c2f6811ae408fb72e262116e864cf1e75d9503bd6a5ced04fb4 \ - --hash=sha256:252185cbe85c057796458f365425d45d7cd7f748ca53dbc906359a22e156cfd2 \ - --hash=sha256:2ec7cc10a65b6ea9efd46e9c6f247e01c707c92074d2ba0be5c2641defe858f7 \ - --hash=sha256:30427c764aa0fcc6983af78bcbd540e10a87a094cbe428006329c6666ce00db8 \ - --hash=sha256:527c096af06aa0620d3d361b17e6d314e9d4800ce53c2ad841d9fe5a82488acd \ - --hash=sha256:8c0f5b4001fcaf742f9d74b483249d4675de2f837146baf8f2e4a7999993fcb4 \ - --hash=sha256:a0d0f1a7aebeb9a4145ee09a4667a7510caf97bd127c4b5d6332d013050a7567 \ - --hash=sha256:aead0332e00ae18045f3d4a8eea3891be095aa5bb3a74ea0affa49fe80c40ecd \ - --hash=sha256:b323325ea2dcacfdf3ff8f82a1069ab9e65353cc433625c4ebe54ed70ced4137 \ - --hash=sha256:cc5a53061d65bc8f80b08645b32c814071630e763a897b0db72fbb0e170fc93f \ - --hash=sha256:ee37235d837c9b6bdd921d396017b65df67c4c16befc1772be5266304fdaf427 \ - --hash=sha256:f1d2d8e808523bac32737d167f3b7370429a9e575d156e887779310e57e41b5d \ - --hash=sha256:f5a0279e362c37e2150a32fe35ec20226e9237b6c9927fce8d53ef8e49e64f48 \ - --hash=sha256:f76e27b5a57337352b59b79a342264b9a8557dc11174e6ec222d0b5e266b132f \ +cryptography==2.2.1 \ + --hash=sha256:0f61273eccc681dc5a77dcd517cc2cb74078d1b00adb2b273d0a010153ae43c7 \ + --hash=sha256:27dd18e180608c512433c843ad2d62396399608a0f3603c4d805500caeeec3d6 \ + --hash=sha256:2893ee1d67dace6178732c9ea8c176fedf5b6a6463f72f1378b779cdba8a0ea5 \ + --hash=sha256:2c5265c622e02af289bdc5e96c0a572bffa2fc2ac3f86fac3bace632ab25888c \ + --hash=sha256:34a433c3783946106236c25a89e0c271a3bb1a8e8cd8f12782e8bf8bec4e351e \ + --hash=sha256:39532ae44154ce88eec25d2a361e9c285b2477e0a4b4fc61fb9d4bcb3804dec6 \ + --hash=sha256:469a72fda257b2179bb43e431b822d8087da53b40e68813bcfa54a16c3ebcdfe \ + --hash=sha256:54029ce210d3013dccced6478f4dfb25e7a409e13086f714be9c14489c64e2c7 \ + --hash=sha256:54776f1e2ffd957571b79738fb41d8df69a93edb6d148ca149494d73975e8cab \ + --hash=sha256:84642ad31dccf9969b2613fa532ff5e871e9ee592ab0244dc9f6724e56591b8b \ + --hash=sha256:8ce363eed7ccc70f53be6ea4200aa20bbff99c8cbfce21a904f98e76c2bf5887 \ + --hash=sha256:95b7822c8bf203bafb95527eaf8995d9dd4eef1b6899631f9293aa6926dab1d9 \ + --hash=sha256:9f2d66952fc55f13f9c62ea6ae6ff88c2f9c2c21533065e1f7bddf0cf33c4cb9 \ + --hash=sha256:c27ed8b01d5feeff8479384ed782bad1e5071563f47194703f0dc20c1b558503 \ + --hash=sha256:cf1069fda0c8e1d2bbef2cf0de0be797860c8a34d1df3a24f1180045fc06974f \ + --hash=sha256:dddad9d322a3f0867009ff9f25477b8f7c0bdbedf143704b384c9472f11cb2d3 \ + --hash=sha256:e42b290eb7804d82c6d614b55e3b726dee464099a0e6240175f8d7b682b9295d \ # via moto docker-pycreds==0.2.2 \ --hash=sha256:408ae6ec2b97345e02cbb3a05e0055443a27969e5b61d6773c733b534a40845b \ --hash=sha256:c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299 \ # via docker -docker==3.1.1 \ - --hash=sha256:462165ca6367f802280684ab44e581cd2efba8995d78d07ea994e42194927c3b \ - --hash=sha256:651c6feea03f5f12c823d3adc1db34ecf21e05965908e580d1b651b8c2269e9e \ +docker==3.1.4 \ + --hash=sha256:753251b142d56f243fba53ba321a37740a6b6583c528437f45df4d28ba3d4d5d \ + --hash=sha256:add59251aa15a54c49d1514d576718d762ea5e3d79c2616b6dfaa3fad8d4c9fe \ # via moto docutils==0.14 \ --hash=sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6 \ @@ -122,9 +122,6 @@ flask==0.12.2 \ freezegun==0.3.9 \ --hash=sha256:783ccccd7f60968bfe49ad9e114c18ea2b63831faaaf61c1f1f71ddfde1c0eee \ --hash=sha256:8842688de9497c82ecb40c30274ecc676e97ac78765b0ade105a97063d5b7a11 -future==0.16.0 \ - --hash=sha256:e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb \ - # via aws-xray-sdk idna==2.6 \ --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \ --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4 \ @@ -153,9 +150,9 @@ mock==2.0.0 \ --hash=sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1 \ --hash=sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba \ # via moto -moto==1.1.25 \ - --hash=sha256:09580b1be808964a31b99c796e3e802cea619f30c0b023bfe171ea820a332941 \ - --hash=sha256:d427d6e1a81e926c2b6a071453807b05f4736d65068493e1f3055ac7ee24ea21 +moto==1.3.0 \ + --hash=sha256:485d56c164e5c658665fecd486ef00a3a3cef5904d0bb06741f13f78ab4828a1 \ + --hash=sha256:e3e768828be9889abb2cf60fef14ad4a06208d5f79789913d6b07bc7b4a0be80 nose==1.3.7 \ --hash=sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac \ --hash=sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a \ diff --git a/requirements.in b/requirements.in index 00076194..39a43fac 100644 --- a/requirements.in +++ b/requirements.in @@ -1,34 +1,34 @@ -Flask==0.12 -Flask-RESTful==0.3.6 -Flask-SQLAlchemy>2,<3 -Flask-Script==2.0.6 -Flask-Migrate==2.1.1 -Flask-Bcrypt==0.7.1 -Flask-Principal==0.4.0 -Flask-Mail==0.9.1 -SQLAlchemy-Utils==0.32.21 -requests==2.11.1 -ndg-httpsclient==0.4.2 -psycopg2==2.7.3 -arrow==0.12.0 -six==1.11.0 -marshmallow-sqlalchemy==0.13.1 -gunicorn==19.7.1 -marshmallow==2.15.0 -cryptography==1.9 -xmltodict==0.11.0 -pyjwt==1.5.3 -lockfile==0.12.2 -inflection==0.3.1 -future==0.16.0 -boto3==1.5.7 -acme==0.20.0 -retrying==1.3.3 -tabulate==0.8.2 -pyOpenSSL==17.2.0 -pem==17.1.0 -raven[flask]==6.2.1 -jinja2==2.10 -paramiko==2.4.1 # required for lemur_linuxdst plugin -python_ldap<=3.0.0b4 +acme alembic-autogenerate-enums==0.0.2 +arrow==0.12.0 +boto3 +cryptography +Flask-Bcrypt==0.7.1 +Flask-Mail==0.9.1 +Flask-Migrate==2.1.1 +Flask-Principal==0.4.0 +Flask-RESTful==0.3.6 +Flask-Script==2.0.6 +Flask-SQLAlchemy +Flask==0.12 +future==0.16.0 +gunicorn==19.7.1 +inflection==0.3.1 +jinja2==2.10 +lockfile==0.12.2 +marshmallow-sqlalchemy==0.13.1 +marshmallow==2.15.0 +ndg-httpsclient==0.4.2 +paramiko==2.4.1 # required for lemur_linuxdst plugin +pem==17.1.0 +psycopg2 +pyjwt +pyOpenSSL +python_ldap +raven[flask]==6.2.1 +requests +retrying==1.3.3 +six==1.11.0 +SQLAlchemy-Utils +tabulate==0.8.2 +xmltodict==0.11.0 diff --git a/requirements.txt b/requirements.txt index 68c83090..79da4fb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,316 +2,70 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --generate-hashes --output-file requirements.txt requirements.in +# pip-compile --output-file requirements.txt requirements.in # -acme==0.20.0 \ - --hash=sha256:45121aed6c8cc2f31896ac1083068dfdeb613f3edeff9576dc0d10632ea5a3d5 \ - --hash=sha256:8b0cee192c0d76d6f4045bdb14b3cfd29d9720e0dad2046794a2a555f1eaccb7 -alembic-autogenerate-enums==0.0.2 \ - --hash=sha256:adb49909c864a263f92bf7b99752d5c4b2f496617cccb5cfc689af9c72235ff9 -alembic==0.9.8 \ - --hash=sha256:13b8611788acf0d7b617775db5c2ae26554a6d4263c590ef628d448fd05aef56 \ - # via flask-migrate -aniso8601==3.0.0 \ - --hash=sha256:7cf068e7aec00edeb21879c2bbda048656c34d281e133a77425be03b352122d8 \ - --hash=sha256:f7052eb342bf2000c6264a253acedb362513bf9270800be2bc8e3e229fe08b5a \ - # via flask-restful -arrow==0.12.0 \ - --hash=sha256:a15ecfddf334316e3ac8695e48c15d1be0d6038603b33043930dcf0e675c86ee -asn1crypto==0.24.0 \ - --hash=sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87 \ - --hash=sha256:9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49 \ - # via cryptography -bcrypt==3.1.4 \ - --hash=sha256:01477981abf74e306e8ee31629a940a5e9138de000c6b0898f7f850461c4a0a5 \ - --hash=sha256:054d6e0acaea429e6da3613fcd12d05ee29a531794d96f6ab959f29a39f33391 \ - --hash=sha256:0872eeecdf9a429c1420158500eedb323a132bc5bf3339475151c52414729e70 \ - --hash=sha256:09a3b8c258b815eadb611bad04ca15ec77d86aa9ce56070e1af0d5932f17642a \ - --hash=sha256:0f317e4ffbdd15c3c0f8ab5fbd86aa9aabc7bea18b5cc5951b456fe39e9f738c \ - --hash=sha256:2788c32673a2ad0062bea850ab73cffc0dba874db10d7a3682b6f2f280553f20 \ - --hash=sha256:321d4d48be25b8d77594d8324c0585c80ae91ac214f62db9098734e5e7fb280f \ - --hash=sha256:346d6f84ff0b493dbc90c6b77136df83e81f903f0b95525ee80e5e6d5e4eef84 \ - --hash=sha256:34dd60b90b0f6de94a89e71fcd19913a30e83091c8468d0923a93a0cccbfbbff \ - --hash=sha256:3b4c23300c4eded8895442c003ae9b14328ae69309ac5867e7530de8bdd7875d \ - --hash=sha256:43d1960e7db14042319c46925892d5fa99b08ff21d57482e6f5328a1aca03588 \ - --hash=sha256:49e96267cd9be55a349fd74f9852eb9ae2c427cd7f6455d0f1765d7332292832 \ - --hash=sha256:67ed1a374c9155ec0840214ce804616de49c3df9c5bc66740687c1c9b1cd9e8d \ - --hash=sha256:6efd9ca20aefbaf2e7e6817a2c6ed4a50ff6900fafdea1bcb1d0e9471743b144 \ - --hash=sha256:8569844a5d8e1fdde4d7712a05ab2e6061343ac34af6e7e3d7935b2bd1907bfd \ - --hash=sha256:8629ea6a8a59f865add1d6a87464c3c676e60101b8d16ef404d0a031424a8491 \ - --hash=sha256:988cac675e25133d01a78f2286189c1f01974470817a33eaf4cfee573cfb72a5 \ - --hash=sha256:9a6fedda73aba1568962f7543a1f586051c54febbc74e87769bad6a4b8587c39 \ - --hash=sha256:9eced8962ce3b7124fe20fd358cf8c7470706437fa064b9874f849ad4c5866fc \ - --hash=sha256:a005ed6163490988711ff732386b08effcbf8df62ae93dd1e5bda0714fad8afb \ - --hash=sha256:ae35dbcb6b011af6c840893b32399252d81ff57d52c13e12422e16b5fea1d0fb \ - --hash=sha256:b1e8491c6740f21b37cca77bc64677696a3fb9f32360794d57fa8477b7329eda \ - --hash=sha256:c906bdb482162e9ef48eea9f8c0d967acceb5c84f2d25574c7d2a58d04861df1 \ - --hash=sha256:cb18ffdc861dbb244f14be32c47ab69604d0aca415bee53485fcea4f8e93d5ef \ - --hash=sha256:d86da365dda59010ba0d1ac45aa78390f56bf7f992e65f70b3b081d5e5257b09 \ - --hash=sha256:e22f0997622e1ceec834fd25947dc2ee2962c2133ea693d61805bc867abaf7ea \ - --hash=sha256:f2fe545d27a619a552396533cddf70d83cecd880a611cdfdbb87ca6aec52f66b \ - --hash=sha256:f7fd3ed3745fe6e81e28dc3b3d76cce31525a91f32a387e1febd6b982caf8cdb \ - --hash=sha256:f9210820ee4818d84658ed7df16a7f30c9fba7d8b139959950acef91745cc0f7 \ - # via flask-bcrypt, paramiko -blinker==1.4 \ - --hash=sha256:471aee25f3992bd325afa3772f1063dbdbbca947a041b8b89466dc00d606f8b6 \ - # via flask-mail, flask-principal, raven -boto3==1.5.7 \ - --hash=sha256:00a384f703d7abdc9eb932e64404060b6287543afbd03cae0f811dc29aa2c129 \ - --hash=sha256:c41540a1d74a4ef7c642d91cb47dae884eafe6665d76a1b9ce1032e3aabde56c -botocore==1.8.50 \ - --hash=sha256:898f10e68a7a1c2be621caf046d29a8f782c0ea866d644d5be46472c00a3dee9 \ - --hash=sha256:a80a23e080f4a93d11a1c067a69304dd407d18c358cba1e0df8c96f56c9e98b4 \ - # via boto3, s3transfer -cffi==1.11.5 \ - --hash=sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743 \ - --hash=sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef \ - --hash=sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50 \ - --hash=sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f \ - --hash=sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93 \ - --hash=sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257 \ - --hash=sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3 \ - --hash=sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc \ - --hash=sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04 \ - --hash=sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6 \ - --hash=sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359 \ - --hash=sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596 \ - --hash=sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b \ - --hash=sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd \ - --hash=sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95 \ - --hash=sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e \ - --hash=sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6 \ - --hash=sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca \ - --hash=sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31 \ - --hash=sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1 \ - --hash=sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085 \ - --hash=sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801 \ - --hash=sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4 \ - --hash=sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184 \ - --hash=sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917 \ - --hash=sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f \ - --hash=sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb \ - # via bcrypt, cryptography, pynacl -click==6.7 \ - --hash=sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d \ - --hash=sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b \ - # via flask -cryptography==1.9 \ - --hash=sha256:025a96e48164106f2082b00f42bf430cf21f09e203e42585a712e420b75cbff0 \ - --hash=sha256:2230c186182d773064d06242e0fa604cd718bfff28aa9c5ae73d7e426e98a151 \ - --hash=sha256:2908f709f02711dbb10561a9f154d2f7d1792385e2341e9708539cc4ecfb8667 \ - --hash=sha256:2a5e577f5d2093e51486b4ec02b51bb5adb165b98fee99929d5af0813e90b469 \ - --hash=sha256:2eb8297b877cb6b56216750fa7017c9f5786bec8afd6a0f1aaace02cbfb6195f \ - --hash=sha256:365eb804362e581c9a02e7a610b30514f07dd77b2a38aed338eb5192446bbc58 \ - --hash=sha256:3dc94ed5a26b8553a325767358f505c0a43e0c89df078647f77a4d022ddcdc57 \ - --hash=sha256:469a9d3d851038f1eb7d7f77bb08bb4775b41483372be450e25b293fe57bd59e \ - --hash=sha256:533143321d15c8743f91eec5c5f495c1b5cad9a25de8f6dab01eddd6b416903e \ - --hash=sha256:5474fe5ce6b517d3086e0231b6ad88f8978c551c4379f91c3d619c308490f0d7 \ - --hash=sha256:5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882 \ - --hash=sha256:5ff169869624e23767d70db274f13a9ea4e97c029425a1224aa5e049e84ce2af \ - --hash=sha256:61eb3534f8ed2415dd708b28919205d523f220e4cd5b8165844edfdd4a649b8e \ - --hash=sha256:7db719432648f14ea33edffc5f75330c595804eac86ca916528b35ce50a8bfd6 \ - --hash=sha256:9d9da8bac2e31003d092f5ef6981a725c77c4e9a30638436884d61ad39f9a1ee \ - --hash=sha256:c26e057a2de13e97e708328d295c5ac4cd3eab4a5c42ce727dd1a53316034b8a \ - --hash=sha256:ca72537a7064bb80e34b6908e576ffc8e2c2cad29a7168f48d0999df089695c3 \ - --hash=sha256:fab8ec6866e384d9827d5dc02a1383e991a6c05c54f818316c4b829e56ca2ba3 -docutils==0.14 \ - --hash=sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6 \ - --hash=sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 \ - --hash=sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6 \ - # via botocore -flask-bcrypt==0.7.1 \ - --hash=sha256:d71c8585b2ee1c62024392ebdbc447438564e2c8c02b4e57b56a4cafd8d13c5f -flask-mail==0.9.1 \ - --hash=sha256:22e5eb9a940bf407bcf30410ecc3708f3c56cc44b29c34e1726fe85006935f41 -flask-migrate==2.1.1 \ - --hash=sha256:493f9b3795985b9b4915bf3b7d16946697f027b73545384e7d9e3a79f989d2fe \ - --hash=sha256:b709ca8642559c3c5a81a33ab10839fa052177accd5ba821047a99db635255ed -flask-principal==0.4.0 \ - --hash=sha256:f5d6134b5caebfdbb86f32d56d18ee44b080876a27269560a96ea35f75c99453 -flask-restful==0.3.6 \ - --hash=sha256:5795519501347e108c436b693ff9a4d7b373a3ac9069627d64e4001c05dd3407 \ - --hash=sha256:e2f1b8063de3944b94c7f8be5cee4d2161db0267c54c5b757d875295061776fa -flask-script==2.0.6 \ - --hash=sha256:6425963d91054cfcc185807141c7314a9c5ad46325911bd24dcb489bd0161c65 -flask-sqlalchemy==2.3.2 \ - --hash=sha256:3bc0fac969dd8c0ace01b32060f0c729565293302f0c4269beed154b46bec50b \ - --hash=sha256:5971b9852b5888655f11db634e87725a9031e170f37c0ce7851cf83497f56e53 -flask==0.12 \ - --hash=sha256:7f03bb2c255452444f7265eddb51601806e5447b6f8a2d50bbc77a654a14c118 \ - --hash=sha256:93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b -future==0.16.0 \ - --hash=sha256:e39ced1ab767b5936646cedba8bcce582398233d6a627067d4c6a454c90cfedb -gunicorn==19.7.1 \ - --hash=sha256:75af03c99389535f218cc596c7de74df4763803f7b63eb09d77e92b3956b36c6 \ - --hash=sha256:eee1169f0ca667be05db3351a0960765620dad53f53434262ff8901b68a1b622 -idna==2.6 \ - --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \ - --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4 \ - # via cryptography -inflection==0.3.1 \ - --hash=sha256:18ea7fb7a7d152853386523def08736aa8c32636b047ade55f7578c4edeb16ca -itsdangerous==0.24 \ - --hash=sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519 \ - # via flask -jinja2==2.10 \ - --hash=sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd \ - --hash=sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4 -jmespath==0.9.3 \ - --hash=sha256:6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64 \ - --hash=sha256:f11b4461f425740a1d908e9a3f7365c3d2e569f6ca68a2ff8bc5bcd9676edd63 \ - # via boto3, botocore -lockfile==0.12.2 \ - --hash=sha256:6aed02de03cba24efabcd600b30540140634fc06cfa603822d508d5361e9f799 \ - --hash=sha256:6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa -mako==1.0.7 \ - --hash=sha256:4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae \ - # via alembic -markupsafe==1.0 \ - --hash=sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 \ - # via jinja2, mako -marshmallow-sqlalchemy==0.13.1 \ - --hash=sha256:4cc7f984f02564f0a444e1dcb69bbd5b6c7ebd30728332d668ffeeefe5d2878e \ - --hash=sha256:f3e1f27c83a013b114c26c8fad59980067030b0db9863b7ff52b31ce85620201 -marshmallow==2.15.0 \ - --hash=sha256:8740ada95f47fa19f905772aa4932dc5512226a90c30da5672d6d6bf3dd791a7 \ - --hash=sha256:d3f31fe7be2106b1d783cbd0765ef4e1c6615505514695f33082805f929dd584 -mock==2.0.0 \ - --hash=sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1 \ - --hash=sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba \ - # via acme -ndg-httpsclient==0.4.2 \ - --hash=sha256:580987ef194334c50389e0d7de885fccf15605c13c6eecaabd8d6c43768eb8ac -paramiko==2.4.1 \ - --hash=sha256:24fb31c947de85fbdeca09e222d41206781581fb0bdf118d2ef18f6e414cd388 \ - --hash=sha256:33e36775a6c71790ba7692a73f948b329cf9295a72b0102144b031114bd2a4f3 -pbr==3.1.1 \ - --hash=sha256:05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1 \ - --hash=sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac \ - # via mock -pem==17.1.0 \ - --hash=sha256:80c83846e927139773f79cdc581f8e276eb7b3f7a0f0a08c7dabe8e51374b97b \ - --hash=sha256:f64f0eb25f700a83cbb21b8f82a1a470f0fd75865e2c84606b3f912b01f65f48 -psycopg2==2.7.3 \ - --hash=sha256:162ab9fc7c2be46b45978bdeecc54ab48f90e57c26c927bfbdcbedee77d22dac \ - --hash=sha256:1b40c5549c0e39c95e26df4c6cdf49f3d85def38310da78628f1d29c3e7d177e \ - --hash=sha256:2854703bf7c1287408f16d66a011426be07540748f19a84644677d6b8d1284a7 \ - --hash=sha256:29db29bc5603ff9dc3a639a8e329ca4ab970d01d6fd27bcf2038e6514fe161f4 \ - --hash=sha256:2fd25489f2fc5b1a4ab4a131cb7e6c804a664b4201e03d1c5aefcbb055b8bad6 \ - --hash=sha256:4807cc2a3bf844b882bd11bdf43805430993ac29fa95ac3ed1cbaa24ab9c0319 \ - --hash=sha256:4dd7ce445059e63b249dbcf6a759c45d1ae5f4e6468c60d50f4829e09d52cd4a \ - --hash=sha256:5c11fc5091af28d048c321f2b23a3f984ffb5b546ab3cb7424c52c6feae6c965 \ - --hash=sha256:5d6d3e80658bf7436202358490beabe7fc78497f5defecb4e9db91d19d5d2778 \ - --hash=sha256:624d9e75d5cf636236ef0e7c325761d8e795200c91154d344b0efcdece535a93 \ - --hash=sha256:65a7560c7dc45cd7cb8083e07341789ca9c1e3d668c04e198ec925da1ef0012c \ - --hash=sha256:6a81bba87531e11e93eb5e193e3f25498eb4e3d7a0a730675ea311913ea93f8f \ - --hash=sha256:6be1b5c96a122387afef18669f3bb0fb255a22e77da85bc37fdd5367a446880c \ - --hash=sha256:94f7ca8013fa17b14e8be72dcc4994046fcd40f85b8cf45d13cdfcf777aad0f4 \ - --hash=sha256:9b3009f237df518951fc2385dd444b7d79b83c4a9cdd26141d2bd9eabd32d681 \ - --hash=sha256:9bfadd7163ec17983c1e395782755ea1c15702e4b79ed333ff70995cd4fb5505 \ - --hash=sha256:a1f302a2ef32b16a8a6515d5ae6368460ad7434ba6a3751f5a2c1084f6234ff6 \ - --hash=sha256:ad2d1274e69fac940c66854cbc92c9eda572b4b30cab4073d4383148874a8974 \ - --hash=sha256:b148f8ccdf9d59bf762b67b80c4a46b9ce1e90dee0f10907640e5a18b07d0ee6 \ - --hash=sha256:b2bc3bc99355fe26a76d1225c32ae6f97604f575cb41cd8e8a4932bbc5b932a7 \ - --hash=sha256:b60024e969aaecc47530f96c723c4cac63d34606fb57806bed49991ff35aecea \ - --hash=sha256:b807ca62f8844f3eb7bff5790ffc4bd851f51a22f453b59fe3c9461e097eac6d \ - --hash=sha256:bbb843f752f582de95db533d371cf55acf69acd86b0b22e35d89f045c1f6c139 \ - --hash=sha256:bc580e4dd39031eea0a662a3e8353b9fa90e500aa7ae14b4589cd4572f7ba4c3 \ - --hash=sha256:c9bd49848556d04093909faec017c3675efabf78c2b7f383bf7c43ba18324ac8 \ - --hash=sha256:cbd910a5d9e3c2e49c2e8f827f2261c27260260a0b46284445d1a3dd12265be8 \ - --hash=sha256:cf4f620f3401e4e8f9e2934c45284e21d404bbe65cd7b81a50402f30c1160109 \ - --hash=sha256:d2089a8dc7fea97386d66e46aabf5674538d946dcaf3374f736411638c93c2c4 \ - --hash=sha256:db49705698f9edd4878457166b09e53788d3e7f10d86f490ee5978ce2613bc06 \ - --hash=sha256:f2ae745ee9b65e04fcca2bbb7ff6d92c196b732f04d0b570310f8958b58ecb64 \ - --hash=sha256:febc7334b1f33c08c5c8d29353d557d8510ff1205f9e7ef454a3f8306c79e9b4 -pyasn1-modules==0.2.1 \ - --hash=sha256:47fb6757ab78fe966e7c58b2030b546854f78416d653163f0ce9290cf2278e8b \ - --hash=sha256:af00ea8f2022b6287dc375b2c70f31ab5af83989fc6fe9eacd4976ce26cd7ccc \ - # via python-ldap -pyasn1==0.4.2 \ - --hash=sha256:d258b0a71994f7770599835249cece1caef3c70def868c4915e6e5ca49b67d15 \ - --hash=sha256:d5cd6ed995dba16fad0c521cfe31cd2d68400b53fcc2bce93326829be73ab6d1 \ - # via paramiko, pyasn1-modules, python-ldap, requests -pycparser==2.18 \ - --hash=sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226 \ - # via cffi -pyjwt==1.5.3 \ - --hash=sha256:500be75b17a63f70072416843dc80c8821109030be824f4d14758f114978bae7 \ - --hash=sha256:a4e5f1441e3ca7b382fd0c0b416777ced1f97c64ef0c33bfa39daf38505cfd2f -pyldap==3.0.0 \ - --hash=sha256:9c10dc9663d3b3f5899f811fcb89618cc96d41b9f8a68b3eed5f13de5b44ce24 -pynacl==1.2.1 \ - --hash=sha256:04e30e5bdeeb2d5b34107f28cd2f5bbfdc6c616f3be88fc6f53582ff1669eeca \ - --hash=sha256:0bfa0d94d2be6874e40f896e0a67e290749151e7de767c5aefbad1121cad7512 \ - --hash=sha256:11aa4e141b2456ce5cecc19c130e970793fa3a2c2e6fbb8ad65b28f35aa9e6b6 \ - --hash=sha256:13bdc1fe084ff9ac7653ae5a924cae03bf4bb07c6667c9eb5b6eb3c570220776 \ - --hash=sha256:14339dc233e7a9dda80a3800e64e7ff89d0878ba23360eea24f1af1b13772cac \ - --hash=sha256:1d33e775fab3f383167afb20b9927aaf4961b953d76eeb271a5703a6d756b65b \ - --hash=sha256:2a42b2399d0428619e58dac7734838102d35f6dcdee149e0088823629bf99fbb \ - --hash=sha256:2dce05ac8b3c37b9e2f65eab56c544885607394753e9613fd159d5e2045c2d98 \ - --hash=sha256:6453b0dae593163ffc6db6f9c9c1597d35c650598e2c39c0590d1757207a1ac2 \ - --hash=sha256:73a5a96fb5fbf2215beee2353a128d382dbca83f5341f0d3c750877a236569ef \ - --hash=sha256:8abb4ef79161a5f58848b30ab6fb98d8c466da21fdd65558ce1d7afc02c70b5f \ - --hash=sha256:8ac1167195b32a8755de06efd5b2d2fe76fc864517dab66aaf65662cc59e1988 \ - --hash=sha256:8f505f42f659012794414fa57c498404e64db78f1d98dfd40e318c569f3c783b \ - --hash=sha256:be71cd5fce04061e1f3d39597f93619c80cdd3558a6c9ba99a546f144a8d8101 \ - --hash=sha256:cf6877124ae6a0698404e169b3ba534542cfbc43f939d46b927d956daf0a373a \ - --hash=sha256:d0eb5b2795b7ee2cbcfcadacbe95a13afbda048a262bd369da9904fecb568975 \ - --hash=sha256:d795f506bcc9463efb5ebb0f65ed77921dcc9e0a50499dedd89f208445de9ecb \ - --hash=sha256:d8aaf7e5d6b0e0ef7d6dbf7abeb75085713d0100b4eb1a4e4e857de76d77ac45 \ - --hash=sha256:e0d38fa0a75f65f556fb912f2c6790d1fa29b7dd27a1d9cc5591b281321eaaa9 \ - --hash=sha256:eb2acabbd487a46b38540a819ef67e477a674481f84a82a7ba2234b9ba46f752 \ - --hash=sha256:eeee629828d0eb4f6d98ac41e9a3a6461d114d1d0aa111a8931c049359298da0 \ - --hash=sha256:f5ce9e26d25eb0b2d96f3ef0ad70e1d3ae89b5d60255c462252a3e456a48c053 \ - --hash=sha256:fabf73d5d0286f9e078774f3435601d2735c94ce9e514ac4fb945701edead7e4 \ - # via paramiko -pyopenssl==17.2.0 \ - --hash=sha256:5d617ce36b07c51f330aa63b83bf7f25c40a0e95958876d54d1982f8c91b4834 \ - --hash=sha256:c8959e441c2d85d646f3d6e9024ec02b2fc8dda92596e44ce3460b3a476bc694 -pyrfc3339==1.0 \ - --hash=sha256:8dfbc6c458b8daba1c0f3620a8c78008b323a268b27b7359e92a4ae41325f535 \ - --hash=sha256:eea31835c56e2096af4363a5745a784878a61d043e247d3a6d6a0a32a9741f56 \ - # via acme -python-dateutil==2.7.0 \ - --hash=sha256:07009062406cffd554a9b4135cd2ff167c9bf6b7aac61fe946c93e69fad1bbd8 \ - --hash=sha256:8f95bb7e6edbb2456a51a1fb58c8dca942024b4f5844cae62c90aa88afe6e300 \ - # via alembic, arrow, botocore -python-editor==1.0.3 \ - --hash=sha256:a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565 \ - # via alembic -python-ldap==3.0.0 \ - --hash=sha256:86746b912a2cd37a54b06c694f021b0c8556d4caeab75ef50435ada152e2fbe1 \ - # via pyldap -pytz==2018.3 \ - --hash=sha256:07edfc3d4d2705a20a6e99d97f0c4b61c800b8232dc1c04d87e8554f130148dd \ - --hash=sha256:410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0 \ - # via acme, flask-restful, pyrfc3339 -raven[flask]==6.2.1 \ - --hash=sha256:c0a30bcc3e3206059f79656d80362ce080b1c991c95d867edce559a7294570fe \ - --hash=sha256:f58ead6842c02d427617e827f4c0a97cfd3f8b648a52e53ef12182002a8663cb -requests[security]==2.11.1 \ - --hash=sha256:545c4855cd9d7c12671444326337013766f4eea6068c3f0307fb2dc2696d580e \ - --hash=sha256:5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 -retrying==1.3.3 \ - --hash=sha256:08c039560a6da2fe4f2c426d0766e284d3b736e355f8dd24b37367b0bb41973b -s3transfer==0.1.13 \ - --hash=sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1 \ - --hash=sha256:c7a9ec356982d5e9ab2d4b46391a7d6a950e2b04c472419f5fdec70cc0ada72f \ - # via boto3 -six==1.11.0 \ - --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \ - --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb -sqlalchemy-utils==0.32.21 \ - --hash=sha256:e35431b0e57c4f7030ff598c23813c8b7b04b508ce10e8e9ebe448645b38d6d7 -sqlalchemy==1.2.5 \ - --hash=sha256:249000654107a420a40200f1e0b555a79dfd4eff235b2ff60bc77714bd045f2d \ - # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils -tabulate==0.8.2 \ - --hash=sha256:e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2 -werkzeug==0.14.1 \ - --hash=sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c \ - --hash=sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b \ - # via flask -xmltodict==0.11.0 \ - --hash=sha256:8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df \ - --hash=sha256:add07d92089ff611badec526912747cf87afd4f9447af6661aca074eeaf32615 +acme==0.22.2 +alembic-autogenerate-enums==0.0.2 +alembic==0.9.8 # via flask-migrate +aniso8601==3.0.0 # via flask-restful +arrow==0.12.0 +asn1crypto==0.24.0 # via cryptography +bcrypt==3.1.4 # via flask-bcrypt, paramiko +blinker==1.4 # via flask-mail, flask-principal, raven +boto3==1.6.12 +botocore==1.9.12 # via boto3, s3transfer +certifi==2018.1.18 # via requests +cffi==1.11.5 # via bcrypt, cryptography, pynacl +chardet==3.0.4 # via requests +click==6.7 # via flask +cryptography==2.2.1 +docutils==0.14 # via botocore +flask-bcrypt==0.7.1 +flask-mail==0.9.1 +flask-migrate==2.1.1 +flask-principal==0.4.0 +flask-restful==0.3.6 +flask-script==2.0.6 +flask-sqlalchemy==2.3.2 +flask==0.12 +future==0.16.0 +gunicorn==19.7.1 +idna==2.6 # via cryptography, requests +inflection==0.3.1 +itsdangerous==0.24 # via flask +jinja2==2.10 +jmespath==0.9.3 # via boto3, botocore +josepy==1.0.1 # via acme +lockfile==0.12.2 +mako==1.0.7 # via alembic +markupsafe==1.0 # via jinja2, mako +marshmallow-sqlalchemy==0.13.1 +marshmallow==2.15.0 +mock==2.0.0 # via acme +ndg-httpsclient==0.4.2 +paramiko==2.4.1 +pbr==3.1.1 # via mock +pem==17.1.0 +psycopg2==2.7.4 +pyasn1-modules==0.2.1 # via python-ldap +pyasn1==0.4.2 # via paramiko, pyasn1-modules, python-ldap +pycparser==2.18 # via cffi +pyjwt==1.6.1 +pynacl==1.2.1 # via paramiko +pyopenssl==17.5.0 +pyrfc3339==1.0 # via acme +python-dateutil==2.6.1 # via alembic, arrow, botocore +python-editor==1.0.3 # via alembic +python-ldap==3.0.0 +pytz==2018.3 # via acme, flask-restful, pyrfc3339 +raven[flask]==6.2.1 +requests[security]==2.18.4 +retrying==1.3.3 +s3transfer==0.1.13 # via boto3 +six==1.11.0 +sqlalchemy-utils==0.33.1 +sqlalchemy==1.2.5 # via alembic, flask-sqlalchemy, marshmallow-sqlalchemy, sqlalchemy-utils +tabulate==0.8.2 +urllib3==1.22 # via requests +werkzeug==0.14.1 # via flask +xmltodict==0.11.0 From e15836e9ca1aa19c6fad3c226e2aeeeba2205416 Mon Sep 17 00:00:00 2001 From: Curtis Castrapel Date: Wed, 21 Mar 2018 14:48:51 -0700 Subject: [PATCH 10/10] Update more dependencies. Remove hashes --- lemur/plugins/base/manager.py | 4 + requirements-dev.txt | 118 +++----------- requirements-docs.txt | 104 +++--------- requirements-tests.in | 15 +- requirements-tests.txt | 293 ++++++---------------------------- requirements.in | 4 +- requirements.txt | 2 +- 7 files changed, 114 insertions(+), 426 deletions(-) diff --git a/lemur/plugins/base/manager.py b/lemur/plugins/base/manager.py index 12556e7d..e6c29c4e 100644 --- a/lemur/plugins/base/manager.py +++ b/lemur/plugins/base/manager.py @@ -34,6 +34,10 @@ class PluginManager(InstanceManager): for plugin in self.all(version=2): if plugin.slug == slug: return plugin + current_app.logger.error( + "Unable to find slug: {} in self.all version 1: {} or version 2: {}".format( + slug, self.all(version=1), self.all(version=2)) + ) raise KeyError(slug) def first(self, func_name, *args, **kwargs): diff --git a/requirements-dev.txt b/requirements-dev.txt index 8e3ace25..8a4185e3 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -2,98 +2,28 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --generate-hashes --output-file requirements-dev.txt requirements-dev.in +# pip-compile --output-file requirements-dev.txt requirements-dev.in # -aspy.yaml==1.0.0 \ - --hash=sha256:6215f44900ff65f27dbd00a36b06a7926276436ed377320cfd4febd69bbd4a94 \ - --hash=sha256:be70cc0ccd1ee1d30f589f2403792eb2ffa7546470af0a17179541b13d8374df \ - # via pre-commit -cached-property==1.4.0 \ - --hash=sha256:6e6935ec62567fbcbc346fad84fcea9bc77e3547b7267e62bc5b7ed8e5438ae8 \ - --hash=sha256:a2fa0f89dd422f7e5dd992a4a3e0ce209d5d1e47a4db28fd0a7b5273ec8da3f0 \ - # via pre-commit -certifi==2018.1.18 \ - --hash=sha256:14131608ad2fd56836d33a71ee60fa1c82bc9d2c8d98b7bdbc631fe1b3cd1296 \ - --hash=sha256:edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d \ - # via requests -cfgv==1.0.0 \ - --hash=sha256:2fbaf8d082456d8fff5a68163ff59c1025a52e906914fbc738be7d8ea5b7aa4b \ - --hash=sha256:733aa2f66b5106af32d271336a571610b9808e868de0ad5690d9d5155e5960c5 \ - # via pre-commit -chardet==3.0.4 \ - --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ - --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \ - # via requests -flake8==3.5.0 \ - --hash=sha256:7253265f7abd8b313e3892944044a365e3f4ac3fcdcfb4298f55ee9ddf188ba0 \ - --hash=sha256:c7841163e2b576d435799169b78703ad6ac1bbb0f199994fc05f700b2a90ea37 -identify==1.0.8 \ - --hash=sha256:53be6ea950a5f40e13be2dd87e67413eb6879527b831333196ab2a54de38f499 \ - --hash=sha256:c0bfb29634e04cde8e54aee2d55aff9dad30d6ea1f3e9e3ce731934d78635aa1 \ - # via pre-commit -idna==2.6 \ - --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \ - --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4 \ - # via requests -invoke==0.22.1 \ - --hash=sha256:357f0661c1d84f9f113e6164705d92eb00b35cd704c31e82efbf0f012f25e40c \ - --hash=sha256:39020b07218c87747e85dd422510f02a8d1282c71952942324c67d9eeaae8e62 \ - --hash=sha256:621181a0efae67b3dadec583cf2c6b5096136635bf6a326c481c73db412b36fc -mccabe==0.6.1 \ - --hash=sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42 \ - --hash=sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f \ - # via flake8 -nodeenv==1.3.0 \ - --hash=sha256:dd0a34001090ff042cfdb4b0c8d6a6f7ec9baa49733f00b695bb8a8b4700ba6c -pkginfo==1.4.2 \ - --hash=sha256:5878d542a4b3f237e359926384f1dde4e099c9f5525d236b1840cf704fa8d474 \ - --hash=sha256:a39076cb3eb34c333a0dd390b568e9e1e881c7bf2cc0aee12120636816f55aee \ - # via twine -pre-commit==1.8.2 \ - --hash=sha256:01bb5f44606735ca30c8be641fa24f5760fcc599a0260ead0067bcde2f0305f9 \ - --hash=sha256:823452163aa9fb024a9ff30947ba7f5a2778708db7554a4d36438b9bbead6bbb -pycodestyle==2.3.1 \ - --hash=sha256:682256a5b318149ca0d2a9185d365d8864a768a28db66a84a2ea946bcc426766 \ - --hash=sha256:6c4245ade1edfad79c3446fadfc96b0de2759662dc29d07d80a6f27ad1ca6ba9 \ - # via flake8 -pyflakes==1.6.0 \ - --hash=sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f \ - --hash=sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805 \ - # via flake8 -pyyaml==3.12 \ - --hash=sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736 \ - --hash=sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f \ - --hash=sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab \ - --hash=sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7 \ - --hash=sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1 \ - --hash=sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8 \ - --hash=sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4 \ - --hash=sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269 \ - # via aspy.yaml, pre-commit -requests-toolbelt==0.8.0 \ - --hash=sha256:42c9c170abc2cacb78b8ab23ac957945c7716249206f90874651971a4acff237 \ - --hash=sha256:f6a531936c6fa4c6cfce1b9c10d5c4f498d16528d2a54a22ca00011205a187b5 \ - # via twine -requests==2.18.4 \ - --hash=sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b \ - --hash=sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e \ - # via requests-toolbelt, twine -six==1.11.0 \ - --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \ - --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb \ - # via cfgv, pre-commit -tqdm==4.19.8 \ - --hash=sha256:05e991ecb0f874046ddcb374396a626afd046fb4d31f73633ea752b844458a7a \ - --hash=sha256:2aea9f81fdf127048667e0ba22f5fc10ebc879fb838dc52dcf055242037ec1f7 \ - # via twine -twine==1.11.0 \ - --hash=sha256:08eb132bbaec40c6d25b358f546ec1dc96ebd2638a86eea68769d9e67fe2b129 \ - --hash=sha256:2fd9a4d9ff0bcacf41fdc40c8cb0cfaef1f1859457c9653fd1b92237cc4e9f25 -urllib3==1.22 \ - --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \ - --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f \ - # via requests -virtualenv==15.1.0 \ - --hash=sha256:02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a \ - --hash=sha256:39d88b533b422825d644087a21e78c45cf5af0ef7a99a1fc9fbb7b481e5c85b0 \ - # via pre-commit +aspy.yaml==1.0.0 # via pre-commit +cached-property==1.4.0 # via pre-commit +certifi==2018.1.18 # via requests +cfgv==1.0.0 # via pre-commit +chardet==3.0.4 # via requests +flake8==3.5.0 +identify==1.0.8 # via pre-commit +idna==2.6 # via requests +invoke==0.22.1 +mccabe==0.6.1 # via flake8 +nodeenv==1.3.0 +pkginfo==1.4.2 # via twine +pre-commit==1.8.2 +pycodestyle==2.3.1 # via flake8 +pyflakes==1.6.0 # via flake8 +pyyaml==3.12 # via aspy.yaml, pre-commit +requests-toolbelt==0.8.0 # via twine +requests==2.18.4 # via requests-toolbelt, twine +six==1.11.0 # via cfgv, pre-commit +tqdm==4.19.8 # via twine +twine==1.11.0 +urllib3==1.22 # via requests +virtualenv==15.1.0 # via pre-commit diff --git a/requirements-docs.txt b/requirements-docs.txt index 26b7c6d9..373468c1 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -2,86 +2,26 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --generate-hashes --output-file requirements-docs.txt requirements-docs.in +# pip-compile --output-file requirements-docs.txt requirements-docs.in # -alabaster==0.7.10 \ - --hash=sha256:2eef172f44e8d301d25aff8068fddd65f767a3f04b5f15b0f4922f113aa1c732 \ - --hash=sha256:37cdcb9e9954ed60912ebc1ca12a9d12178c26637abdf124e3cde2341c257fe0 \ - # via sphinx -babel==2.5.3 \ - --hash=sha256:8ce4cb6fdd4393edd323227cba3a077bceb2a6ce5201c902c65e730046f41f14 \ - --hash=sha256:ad209a68d7162c4cff4b29cdebe3dec4cef75492df501b0049a9433c96ce6f80 \ - # via sphinx -certifi==2018.1.18 \ - --hash=sha256:14131608ad2fd56836d33a71ee60fa1c82bc9d2c8d98b7bdbc631fe1b3cd1296 \ - --hash=sha256:edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d \ - # via requests -chardet==3.0.4 \ - --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ - --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \ - # via requests -docutils==0.14 \ - --hash=sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6 \ - --hash=sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 \ - --hash=sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6 \ - # via sphinx -idna==2.6 \ - --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \ - --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4 \ - # via requests -imagesize==1.0.0 \ - --hash=sha256:3620cc0cadba3f7475f9940d22431fc4d407269f1be59ec9b8edcca26440cf18 \ - --hash=sha256:5b326e4678b6925158ccc66a9fa3122b6106d7c876ee32d7de6ce59385b96315 \ - # via sphinx -jinja2==2.10 \ - --hash=sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd \ - --hash=sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4 \ - # via sphinx -markupsafe==1.0 \ - --hash=sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 \ - # via jinja2 -packaging==17.1 \ - --hash=sha256:e9215d2d2535d3ae866c3d6efc77d5b24a0192cce0ff20e42896cc0664f889c0 \ - --hash=sha256:f019b770dd64e585a99714f1fd5e01c7a8f11b45635aa953fd41c689a657375b \ - # via sphinx -pygments==2.2.0 \ - --hash=sha256:78f3f434bcc5d6ee09020f92ba487f95ba50f1e3ef83ae96b9d5ffa1bab25c5d \ - --hash=sha256:dbae1046def0efb574852fab9e90209b23f556367b5a320c0bcb871c77c3e8cc \ - # via sphinx -pyparsing==2.2.0 \ - --hash=sha256:0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04 \ - --hash=sha256:fee43f17a9c4087e7ed1605bd6df994c6173c1e977d7ade7b651292fab2bd010 \ - # via packaging -pytz==2018.3 \ - --hash=sha256:07edfc3d4d2705a20a6e99d97f0c4b61c800b8232dc1c04d87e8554f130148dd \ - --hash=sha256:410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0 \ - # via babel -requests==2.18.4 \ - --hash=sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b \ - --hash=sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e \ - # via sphinx -six==1.11.0 \ - --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \ - --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb \ - # via packaging, sphinx, sphinxcontrib-httpdomain -snowballstemmer==1.2.1 \ - --hash=sha256:919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128 \ - --hash=sha256:9f3bcd3c401c3e862ec0ebe6d2c069ebc012ce142cce209c098ccb5b09136e89 \ - # via sphinx -sphinx-rtd-theme==0.2.4 \ - --hash=sha256:2df74b8ff6fae6965c527e97cca6c6c944886aae474b490e17f92adfbe843417 \ - --hash=sha256:62ee4752716e698bad7de8a18906f42d33664128eea06c46b718fc7fbd1a9f5c -sphinx==1.7.2 \ - --hash=sha256:5a1c9a0fec678c24b9a2f5afba240c04668edb7f45c67ce2ed008996b3f21ae2 \ - --hash=sha256:7a606d77618a753adb79e13605166e3cf6a0e5678526e044236fc1ac43650910 -sphinxcontrib-httpdomain==1.6.1 \ - --hash=sha256:029f596deb7b4246148a8e8a7d041764d0cad545cf4f3bb6252ac90c785ab221 \ - --hash=sha256:2572c10bf84fab856999667369e3604eb209d8dda7321556bfee93fddcfc33b5 -sphinxcontrib-websupport==1.0.1 \ - --hash=sha256:7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9 \ - --hash=sha256:f4932e95869599b89bf4f80fc3989132d83c9faa5bf633e7b5e0c25dffb75da2 \ - # via sphinx -urllib3==1.22 \ - --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \ - --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f \ - # via requests +alabaster==0.7.10 # via sphinx +babel==2.5.3 # via sphinx +certifi==2018.1.18 # via requests +chardet==3.0.4 # via requests +docutils==0.14 # via sphinx +idna==2.6 # via requests +imagesize==1.0.0 # via sphinx +jinja2==2.10 # via sphinx +markupsafe==1.0 # via jinja2 +packaging==17.1 # via sphinx +pygments==2.2.0 # via sphinx +pyparsing==2.2.0 # via packaging +pytz==2018.3 # via babel +requests==2.18.4 # via sphinx +six==1.11.0 # via packaging, sphinx, sphinxcontrib-httpdomain +snowballstemmer==1.2.1 # via sphinx +sphinx-rtd-theme==0.2.4 +sphinx==1.7.2 +sphinxcontrib-httpdomain==1.6.1 +sphinxcontrib-websupport==1.0.1 # via sphinx +urllib3==1.22 # via requests diff --git a/requirements-tests.in b/requirements-tests.in index b2fef92a..71d00c31 100644 --- a/requirements-tests.in +++ b/requirements-tests.in @@ -1,10 +1,11 @@ -factory-boy==2.9.2 -fake-factory==0.7.2 -freezegun==0.3.9 +coverage +factory-boy +Faker +freezegun moto>1,<2 -nose==1.3.7 +nose pyflakes -pytest-flask==0.10.0 +pytest +pytest-flask pytest-mock -pytest==3.3.2 -requests-mock==1.4.0 +requests-mock diff --git a/requirements-tests.txt b/requirements-tests.txt index c2a06fc5..97819b07 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -2,244 +2,57 @@ # This file is autogenerated by pip-compile # To update, run: # -# pip-compile --generate-hashes --output-file requirements-tests.txt requirements-tests.in +# pip-compile --output-file requirements-tests.txt requirements-tests.in # -asn1crypto==0.24.0 \ - --hash=sha256:2f1adbb7546ed199e3c90ef23ec95c5cf3585bac7d11fb7eb562a3fe89c64e87 \ - --hash=sha256:9d5c20441baf0cb60a4ac34cc447c6c189024b6b4c6cd7877034f4965c464e49 \ - # via cryptography -attrs==17.4.0 \ - --hash=sha256:1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9 \ - --hash=sha256:a17a9573a6f475c99b551c0e0a812707ddda1ec9653bed04c13841404ed6f450 \ - # via pytest -aws-xray-sdk==0.95 \ - --hash=sha256:72791618feb22eaff2e628462b0d58f398ce8c1bacfa989b7679817ab1fad60c \ - --hash=sha256:9e7ba8dd08fd2939376c21423376206bff01d0deaea7d7721c6b35921fed1943 \ - # via moto -boto3==1.6.12 \ - --hash=sha256:3e224b2ec4b62d3a88577eb6261fef4898d7aa5baabe58c79b7abf718fca1479 \ - --hash=sha256:a55f74e427ae26e30ee8696312e0caa57bfef58d9bf308fa4221ba2d968c8db2 \ - # via moto -boto==2.48.0 \ - --hash=sha256:13be844158d1bd80a94c972c806ec8381b9ea72035aa06123c5db6bc6a6f3ead \ - --hash=sha256:deb8925b734b109679e3de65856018996338758f4b916ff4fe7bb62b6d7000d1 \ - # via moto -botocore==1.9.12 \ - --hash=sha256:2797b0dd2350c2611cf22fda3ea023b8f21cf3ef3db4bf8929f34ba779adaed0 \ - --hash=sha256:54f28ec362c0ff2dfdc891835bdacdfb01770ab4973816fa37193164608ddbde \ - # via boto3, moto, s3transfer -certifi==2018.1.18 \ - --hash=sha256:14131608ad2fd56836d33a71ee60fa1c82bc9d2c8d98b7bdbc631fe1b3cd1296 \ - --hash=sha256:edbc3f203427eef571f79a7692bb160a2b0f7ccaa31953e99bd17e307cf63f7d \ - # via requests -cffi==1.11.5 \ - --hash=sha256:151b7eefd035c56b2b2e1eb9963c90c6302dc15fbd8c1c0a83a163ff2c7d7743 \ - --hash=sha256:1553d1e99f035ace1c0544050622b7bc963374a00c467edafac50ad7bd276aef \ - --hash=sha256:1b0493c091a1898f1136e3f4f991a784437fac3673780ff9de3bcf46c80b6b50 \ - --hash=sha256:2ba8a45822b7aee805ab49abfe7eec16b90587f7f26df20c71dd89e45a97076f \ - --hash=sha256:3c85641778460581c42924384f5e68076d724ceac0f267d66c757f7535069c93 \ - --hash=sha256:3eb6434197633b7748cea30bf0ba9f66727cdce45117a712b29a443943733257 \ - --hash=sha256:4c91af6e967c2015729d3e69c2e51d92f9898c330d6a851bf8f121236f3defd3 \ - --hash=sha256:770f3782b31f50b68627e22f91cb182c48c47c02eb405fd689472aa7b7aa16dc \ - --hash=sha256:79f9b6f7c46ae1f8ded75f68cf8ad50e5729ed4d590c74840471fc2823457d04 \ - --hash=sha256:7a33145e04d44ce95bcd71e522b478d282ad0eafaf34fe1ec5bbd73e662f22b6 \ - --hash=sha256:857959354ae3a6fa3da6651b966d13b0a8bed6bbc87a0de7b38a549db1d2a359 \ - --hash=sha256:87f37fe5130574ff76c17cab61e7d2538a16f843bb7bca8ebbc4b12de3078596 \ - --hash=sha256:95d5251e4b5ca00061f9d9f3d6fe537247e145a8524ae9fd30a2f8fbce993b5b \ - --hash=sha256:9d1d3e63a4afdc29bd76ce6aa9d58c771cd1599fbba8cf5057e7860b203710dd \ - --hash=sha256:a36c5c154f9d42ec176e6e620cb0dd275744aa1d804786a71ac37dc3661a5e95 \ - --hash=sha256:ae5e35a2c189d397b91034642cb0eab0e346f776ec2eb44a49a459e6615d6e2e \ - --hash=sha256:b0f7d4a3df8f06cf49f9f121bead236e328074de6449866515cea4907bbc63d6 \ - --hash=sha256:b75110fb114fa366b29a027d0c9be3709579602ae111ff61674d28c93606acca \ - --hash=sha256:ba5e697569f84b13640c9e193170e89c13c6244c24400fc57e88724ef610cd31 \ - --hash=sha256:be2a9b390f77fd7676d80bc3cdc4f8edb940d8c198ed2d8c0be1319018c778e1 \ - --hash=sha256:d5d8555d9bfc3f02385c1c37e9f998e2011f0db4f90e250e5bc0c0a85a813085 \ - --hash=sha256:e55e22ac0a30023426564b1059b035973ec82186ddddbac867078435801c7801 \ - --hash=sha256:e90f17980e6ab0f3c2f3730e56d1fe9bcba1891eeea58966e89d352492cc74f4 \ - --hash=sha256:ecbb7b01409e9b782df5ded849c178a0aa7c906cf8c5a67368047daab282b184 \ - --hash=sha256:ed01918d545a38998bfa5902c7c00e0fee90e957ce036a4000a88e3fe2264917 \ - --hash=sha256:edabd457cd23a02965166026fd9bfd196f4324fe6032e866d0f3bd0301cd486f \ - --hash=sha256:fdf1c1dc5bafc32bc5d08b054f94d659422b05aba244d6be4ddc1c72d9aa70fb \ - # via cryptography -chardet==3.0.4 \ - --hash=sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae \ - --hash=sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691 \ - # via requests -click==6.7 \ - --hash=sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d \ - --hash=sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b \ - # via flask -cookies==2.2.1 \ - --hash=sha256:15bee753002dff684987b8df8c235288eb8d45f8191ae056254812dfd42c81d3 \ - --hash=sha256:d6b698788cae4cfa4e62ef8643a9ca332b79bd96cb314294b864ae8d7eb3ee8e \ - # via moto -cryptography==2.2.1 \ - --hash=sha256:0f61273eccc681dc5a77dcd517cc2cb74078d1b00adb2b273d0a010153ae43c7 \ - --hash=sha256:27dd18e180608c512433c843ad2d62396399608a0f3603c4d805500caeeec3d6 \ - --hash=sha256:2893ee1d67dace6178732c9ea8c176fedf5b6a6463f72f1378b779cdba8a0ea5 \ - --hash=sha256:2c5265c622e02af289bdc5e96c0a572bffa2fc2ac3f86fac3bace632ab25888c \ - --hash=sha256:34a433c3783946106236c25a89e0c271a3bb1a8e8cd8f12782e8bf8bec4e351e \ - --hash=sha256:39532ae44154ce88eec25d2a361e9c285b2477e0a4b4fc61fb9d4bcb3804dec6 \ - --hash=sha256:469a72fda257b2179bb43e431b822d8087da53b40e68813bcfa54a16c3ebcdfe \ - --hash=sha256:54029ce210d3013dccced6478f4dfb25e7a409e13086f714be9c14489c64e2c7 \ - --hash=sha256:54776f1e2ffd957571b79738fb41d8df69a93edb6d148ca149494d73975e8cab \ - --hash=sha256:84642ad31dccf9969b2613fa532ff5e871e9ee592ab0244dc9f6724e56591b8b \ - --hash=sha256:8ce363eed7ccc70f53be6ea4200aa20bbff99c8cbfce21a904f98e76c2bf5887 \ - --hash=sha256:95b7822c8bf203bafb95527eaf8995d9dd4eef1b6899631f9293aa6926dab1d9 \ - --hash=sha256:9f2d66952fc55f13f9c62ea6ae6ff88c2f9c2c21533065e1f7bddf0cf33c4cb9 \ - --hash=sha256:c27ed8b01d5feeff8479384ed782bad1e5071563f47194703f0dc20c1b558503 \ - --hash=sha256:cf1069fda0c8e1d2bbef2cf0de0be797860c8a34d1df3a24f1180045fc06974f \ - --hash=sha256:dddad9d322a3f0867009ff9f25477b8f7c0bdbedf143704b384c9472f11cb2d3 \ - --hash=sha256:e42b290eb7804d82c6d614b55e3b726dee464099a0e6240175f8d7b682b9295d \ - # via moto -docker-pycreds==0.2.2 \ - --hash=sha256:408ae6ec2b97345e02cbb3a05e0055443a27969e5b61d6773c733b534a40845b \ - --hash=sha256:c7ab85de2894baff6ee8f15160cbbfa2fd3a04e56f0372c5793d24060687b299 \ - # via docker -docker==3.1.4 \ - --hash=sha256:753251b142d56f243fba53ba321a37740a6b6583c528437f45df4d28ba3d4d5d \ - --hash=sha256:add59251aa15a54c49d1514d576718d762ea5e3d79c2616b6dfaa3fad8d4c9fe \ - # via moto -docutils==0.14 \ - --hash=sha256:02aec4bd92ab067f6ff27a38a38a41173bf01bed8f89157768c1573f53e474a6 \ - --hash=sha256:51e64ef2ebfb29cae1faa133b3710143496eca21c530f3f71424d77687764274 \ - --hash=sha256:7a4bd47eaf6596e1295ecb11361139febe29b084a87bf005bf899f9a42edc3c6 \ - # via botocore -factory-boy==2.9.2 \ - --hash=sha256:340c602f6fed2d8dd160397f28f2c0219e937f0488460450e8e5bf2add020ed6 \ - --hash=sha256:b8334bcc3c5b10af9a83ab5b8786f98cb322638dc1e6d320cad01c7f2b420e87 -fake-factory==0.7.2 \ - --hash=sha256:2f1c3b9b5a76f414d9d98dd2a54cb9f50d10c11c5160c391eb8a36f0ea6c406f \ - --hash=sha256:62a9b211c1eea951f63c992de305c31977768f042210df443885444683528173 -faker==0.8.12 \ - --hash=sha256:9cc12b821f32ff45f6edfdc1ab7be3893b60b1224e952d68322a57e5b26a4a15 \ - --hash=sha256:b06d0dc0166618298e668ced513ced7b10df34f3ad2045f22f1d7d88704e8e9c \ - # via factory-boy -flask==0.12.2 \ - --hash=sha256:0749df235e3ff61ac108f69ac178c9770caeaccad2509cb762ce1f65570a8856 \ - --hash=sha256:49f44461237b69ecd901cc7ce66feea0319b9158743dd27a2899962ab214dac1 \ - # via pytest-flask -freezegun==0.3.9 \ - --hash=sha256:783ccccd7f60968bfe49ad9e114c18ea2b63831faaaf61c1f1f71ddfde1c0eee \ - --hash=sha256:8842688de9497c82ecb40c30274ecc676e97ac78765b0ade105a97063d5b7a11 -idna==2.6 \ - --hash=sha256:2c6a5de3089009e3da7c5dde64a141dbc8551d5b7f6cf4ed7c2568d0cc520a8f \ - --hash=sha256:8c7309c718f94b3a625cb648ace320157ad16ff131ae0af362c9f21b80ef6ec4 \ - # via cryptography, requests -itsdangerous==0.24 \ - --hash=sha256:cbb3fcf8d3e33df861709ecaf89d9e6629cff0a217bc2848f1b41cd30d360519 \ - # via flask -jinja2==2.10 \ - --hash=sha256:74c935a1b8bb9a3947c50a54766a969d4846290e1e788ea44c1392163723c3bd \ - --hash=sha256:f84be1bb0040caca4cea721fcbbbbd61f9be9464ca236387158b0feea01914a4 \ - # via flask, moto -jmespath==0.9.3 \ - --hash=sha256:6a81d4c9aa62caf061cb517b4d9ad1dd300374cd4706997aff9cd6aedd61fc64 \ - --hash=sha256:f11b4461f425740a1d908e9a3f7365c3d2e569f6ca68a2ff8bc5bcd9676edd63 \ - # via boto3, botocore -jsondiff==1.1.1 \ - --hash=sha256:2d0437782de9418efa34e694aa59f43d7adb1899bd9a793f063867ddba8f7893 \ - # via moto -jsonpickle==0.9.6 \ - --hash=sha256:545b3bee0d65e1abb4baa1818edcc9ec239aa9f2ffbfde8084d71c056180054f \ - # via aws-xray-sdk -markupsafe==1.0 \ - --hash=sha256:a6be69091dac236ea9c6bc7d012beab42010fa914c459791d627dad4910eb665 \ - # via jinja2 -mock==2.0.0 \ - --hash=sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1 \ - --hash=sha256:b158b6df76edd239b8208d481dc46b6afd45a846b7812ff0ce58971cf5bc8bba \ - # via moto -moto==1.3.0 \ - --hash=sha256:485d56c164e5c658665fecd486ef00a3a3cef5904d0bb06741f13f78ab4828a1 \ - --hash=sha256:e3e768828be9889abb2cf60fef14ad4a06208d5f79789913d6b07bc7b4a0be80 -nose==1.3.7 \ - --hash=sha256:9ff7c6cc443f8c51994b34a667bbcf45afd6d945be7477b52e97516fd17c53ac \ - --hash=sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a \ - --hash=sha256:f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98 -pbr==3.1.1 \ - --hash=sha256:05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1 \ - --hash=sha256:60c25b7dfd054ef9bb0ae327af949dd4676aa09ac3a9471cdc871d8a9213f9ac \ - # via mock -pluggy==0.6.0 \ - --hash=sha256:7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff \ - # via pytest -py==1.5.2 \ - --hash=sha256:8cca5c229d225f8c1e3085be4fcf306090b00850fefad892f9d96c7b6e2f310f \ - --hash=sha256:ca18943e28235417756316bfada6cd96b23ce60dd532642690dcfdaba988a76d \ - # via pytest -pyaml==17.12.1 \ - --hash=sha256:66623c52f34d83a2c0fc963e08e8b9d0c13d88404e3b43b1852ef71eda19afa3 \ - --hash=sha256:f83fc302c52c6b83a15345792693ae0b5bc07ad19f59e318b7617d7123d62990 \ - # via moto -pycparser==2.18 \ - --hash=sha256:99a8ca03e29851d96616ad0404b4aad7d9ee16f25c9f9708a11faf2810f7b226 \ - # via cffi -pyflakes==1.6.0 \ - --hash=sha256:08bd6a50edf8cffa9fa09a463063c425ecaaf10d1eb0335a7e8b1401aef89e6f \ - --hash=sha256:8d616a382f243dbf19b54743f280b80198be0bca3a5396f1d2e1fca6223e8805 -pytest-flask==0.10.0 \ - --hash=sha256:2c5a36f9033ef8b6f85ddbefaebdd4f89197fc283f94b20dfe1a1beba4b77f03 \ - --hash=sha256:657c7de386215ab0230bee4d76ace0339ae82fcbb34e134e17a29f65032eef03 -pytest-mock==1.7.1 \ - --hash=sha256:03a2fea79d0a83a8de2e77e92afe5f0a5ca99a58cc68f843f9a74de34800a943 \ - --hash=sha256:b879dff61e31fcd4727c227c182f15f222a155293cc64ed5a02d55e0020cf949 -pytest==3.3.2 \ - --hash=sha256:53548280ede7818f4dc2ad96608b9f08ae2cc2ca3874f2ceb6f97e3583f25bc4 \ - --hash=sha256:b84878865558194630c6147f44bdaef27222a9f153bbd4a08908b16bf285e0b1 -python-dateutil==2.6.1 \ - --hash=sha256:891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca \ - --hash=sha256:95511bae634d69bc7329ba55e646499a842bc4ec342ad54a8cdb65645a0aad3c \ - # via botocore, fake-factory, faker, freezegun, moto -pytz==2018.3 \ - --hash=sha256:07edfc3d4d2705a20a6e99d97f0c4b61c800b8232dc1c04d87e8554f130148dd \ - --hash=sha256:410bcd1d6409026fbaa65d9ed33bf6dd8b1e94a499e32168acfc7b332e4095c0 \ - # via moto -pyyaml==3.12 \ - --hash=sha256:16b20e970597e051997d90dc2cddc713a2876c47e3d92d59ee198700c5427736 \ - --hash=sha256:3262c96a1ca437e7e4763e2843746588a965426550f3797a79fca9c6199c431f \ - --hash=sha256:592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab \ - --hash=sha256:5ac82e411044fb129bae5cfbeb3ba626acb2af31a8d17d175004b70862a741a7 \ - --hash=sha256:827dc04b8fa7d07c44de11fabbc888e627fa8293b695e0f99cb544fdfa1bf0d1 \ - --hash=sha256:bc6bced57f826ca7cb5125a10b23fd0f2fff3b7c4701d64c439a300ce665fff8 \ - --hash=sha256:c01b880ec30b5a6e6aa67b09a2fe3fb30473008c85cd6a67359a1b15ed6d83a4 \ - --hash=sha256:e863072cdf4c72eebf179342c94e6989c67185842d9997960b3e69290b2fa269 \ - # via pyaml -requests-mock==1.4.0 \ - --hash=sha256:2931887853c42e1d73879983d5bf03041109472991c5b4b8dba5d11ed23b9d0b \ - --hash=sha256:96a1e45b1c0bd18d14fcb2d55b3b09d6d46237e37bcae3155df4cb75bc42619e -requests==2.18.4 \ - --hash=sha256:6a1b267aa90cac58ac3a765d067950e7dbbf75b1da07e895d1f594193a40a38b \ - --hash=sha256:9c443e7324ba5b85070c4a818ade28bfabedf16ea10206da1132edaa6dda237e \ - # via aws-xray-sdk, docker, moto, requests-mock -s3transfer==0.1.13 \ - --hash=sha256:90dc18e028989c609146e241ea153250be451e05ecc0c2832565231dacdf59c1 \ - --hash=sha256:c7a9ec356982d5e9ab2d4b46391a7d6a950e2b04c472419f5fdec70cc0ada72f \ - # via boto3 -six==1.11.0 \ - --hash=sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9 \ - --hash=sha256:832dc0e10feb1aa2c68dcc57dbb658f1c7e65b9b61af69048abc87a2db00a0eb \ - # via cryptography, docker, docker-pycreds, fake-factory, faker, freezegun, mock, moto, pytest, python-dateutil, requests-mock, websocket-client -text-unidecode==1.2 \ - --hash=sha256:5a1375bb2ba7968740508ae38d92e1f889a0832913cb1c447d5e2046061a396d \ - --hash=sha256:801e38bd550b943563660a91de8d4b6fa5df60a542be9093f7abf819f86050cc \ - # via faker -urllib3==1.22 \ - --hash=sha256:06330f386d6e4b195fbfc736b297f58c5a892e4440e54d294d7004e3a9bbea1b \ - --hash=sha256:cc44da8e1145637334317feebd728bd869a35285b93cbb4cca2577da7e62db4f \ - # via requests -websocket-client==0.47.0 \ - --hash=sha256:188b68b14fdb2d8eb1a111f21b9ffd2dbf1dbc4e4c1d28cf2c37cdbf1dd1cae6 \ - --hash=sha256:a453dc4dfa6e0db3d8fd7738a308a88effe6240c59f3226eb93e8f020c216149 \ - # via docker -werkzeug==0.14.1 \ - --hash=sha256:c3fd7a7d41976d9f44db327260e263132466836cef6f91512889ed60ad26557c \ - --hash=sha256:d5da73735293558eb1651ee2fddc4d0dedcfa06538b8813a2e20011583c9e49b \ - # via flask, moto, pytest-flask -wrapt==1.10.11 \ - --hash=sha256:d4d560d479f2c21e1b5443bbd15fe7ec4b37fe7e53d335d3b9b0a7b1226fe3c6 \ - # via aws-xray-sdk -xmltodict==0.11.0 \ - --hash=sha256:8f8d7d40aa28d83f4109a7e8aa86e67a4df202d9538be40c0cb1d70da527b0df \ - --hash=sha256:add07d92089ff611badec526912747cf87afd4f9447af6661aca074eeaf32615 \ - # via moto +asn1crypto==0.24.0 # via cryptography +attrs==17.4.0 # via pytest +aws-xray-sdk==0.95 # via moto +boto3==1.6.12 # via moto +boto==2.48.0 # via moto +botocore==1.9.12 # via boto3, moto, s3transfer +certifi==2018.1.18 # via requests +cffi==1.11.5 # via cryptography +chardet==3.0.4 # via requests +click==6.7 # via flask +cookies==2.2.1 # via moto +coverage==4.5.1 +cryptography==2.2.1 # via moto +docker-pycreds==0.2.2 # via docker +docker==3.1.4 # via moto +docutils==0.14 # via botocore +factory-boy==2.10.0 +faker==0.8.12 +flask==0.12.2 # via pytest-flask +freezegun==0.3.10 +idna==2.6 # via cryptography, requests +itsdangerous==0.24 # via flask +jinja2==2.10 # via flask, moto +jmespath==0.9.3 # via boto3, botocore +jsondiff==1.1.1 # via moto +jsonpickle==0.9.6 # via aws-xray-sdk +markupsafe==1.0 # via jinja2 +mock==2.0.0 # via moto +moto==1.3.0 +nose==1.3.7 +pbr==3.1.1 # via mock +pluggy==0.6.0 # via pytest +py==1.5.2 # via pytest +pyaml==17.12.1 # via moto +pycparser==2.18 # via cffi +pyflakes==1.6.0 +pytest-flask==0.10.0 +pytest-mock==1.7.1 +pytest==3.4.2 +python-dateutil==2.6.1 # via botocore, faker, freezegun, moto +pytz==2018.3 # via moto +pyyaml==3.12 # via pyaml +requests-mock==1.4.0 +requests==2.18.4 # via aws-xray-sdk, docker, moto, requests-mock +s3transfer==0.1.13 # via boto3 +six==1.11.0 # via cryptography, docker, docker-pycreds, faker, freezegun, mock, moto, pytest, python-dateutil, requests-mock, websocket-client +text-unidecode==1.2 # via faker +urllib3==1.22 # via requests +websocket-client==0.47.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 diff --git a/requirements.in b/requirements.in index 39a43fac..b70855e6 100644 --- a/requirements.in +++ b/requirements.in @@ -16,8 +16,8 @@ gunicorn==19.7.1 inflection==0.3.1 jinja2==2.10 lockfile==0.12.2 -marshmallow-sqlalchemy==0.13.1 -marshmallow==2.15.0 +marshmallow-sqlalchemy +marshmallow ndg-httpsclient==0.4.2 paramiko==2.4.1 # required for lemur_linuxdst plugin pem==17.1.0 diff --git a/requirements.txt b/requirements.txt index 79da4fb1..eaa72bdf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -39,7 +39,7 @@ josepy==1.0.1 # via acme lockfile==0.12.2 mako==1.0.7 # via alembic markupsafe==1.0 # via jinja2, mako -marshmallow-sqlalchemy==0.13.1 +marshmallow-sqlalchemy==0.13.2 marshmallow==2.15.0 mock==2.0.0 # via acme ndg-httpsclient==0.4.2