From 376aa82ed31fe66ac4b1aecc3c22b0fc4fcfc0ea Mon Sep 17 00:00:00 2001 From: Patrick Sanders Date: Wed, 25 Aug 2021 13:14:58 -0700 Subject: [PATCH] Fix active check, update requirements --- repokid/utils/dynamo.py | 2 +- requirements-test.txt | 74 ++++++++++++++++++++++++-------------- requirements.txt | 78 +++++++++++++++++++++-------------------- 3 files changed, 89 insertions(+), 65 deletions(-) diff --git a/repokid/utils/dynamo.py b/repokid/utils/dynamo.py index e265c758..ca0d3b11 100644 --- a/repokid/utils/dynamo.py +++ b/repokid/utils/dynamo.py @@ -272,7 +272,7 @@ def get_role_by_arn( # multiple results, so we'll grab the first match that's active logger.warning("found multiple results for %s in DynamoDB", arn) for item in items: - if item.get("Active", "").lower() == "true": + if item.get("Active", False): return item # type: ignore # we only have one result diff --git a/requirements-test.txt b/requirements-test.txt index 62793c8d..a299b181 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -5,28 +5,28 @@ # pip-compile --no-emit-index-url --output-file=requirements-test.txt requirements-test.in # appdirs==1.4.4 - # via - # black - # virtualenv + # via black attrs==21.2.0 # via pytest +backports.entry-points-selectable==1.1.0 + # via virtualenv bandit==1.7.0 # via -r requirements-test.in -black==21.5b1 +black==21.7b0 # via -r requirements-test.in -certifi==2020.12.5 +certifi==2021.5.30 # via requests -cfgv==3.2.0 +cfgv==3.3.1 # via pre-commit -chardet==4.0.0 +charset-normalizer==2.0.4 # via requests -click==8.0.0 +click==8.0.1 # via black coverage==5.5 # via coveralls -coveralls==3.0.1 +coveralls==3.2.0 # via -r requirements-test.in -distlib==0.3.1 +distlib==0.3.2 # via virtualenv docopt==0.6.2 # via coveralls @@ -38,12 +38,22 @@ flake8==3.9.2 # via -r requirements-test.in gitdb==4.0.7 # via gitpython -gitpython==3.1.16 +gitpython==3.1.18 # via bandit -identify==2.2.4 +identify==2.2.13 # via pre-commit -idna==2.10 +idna==3.2 # via requests +importlib-metadata==4.6.4 + # via + # backports.entry-points-selectable + # click + # flake8 + # pluggy + # pre-commit + # pytest + # stevedore + # virtualenv iniconfig==1.1.1 # via pytest mccabe==0.6.1 @@ -54,19 +64,21 @@ mypy-extensions==0.4.3 # via # black # mypy -mypy==0.812 +mypy==0.910 # via -r requirements-test.in nodeenv==1.6.0 # via pre-commit -packaging==20.9 +packaging==21.0 # via pytest -pathspec==0.8.1 +pathspec==0.9.0 # via black pbr==5.6.0 # via stevedore +platformdirs==2.2.0 + # via virtualenv pluggy==0.13.1 # via pytest -pre-commit==2.12.1 +pre-commit==2.14.0 # via -r requirements-test.in py==1.10.0 # via pytest @@ -80,15 +92,15 @@ pyparsing==2.4.7 # via packaging pytest==6.2.4 # via -r requirements-test.in -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via -r requirements-test.in pyyaml==5.4.1 # via # bandit # pre-commit -regex==2021.4.4 +regex==2021.8.21 # via black -requests==2.25.1 +requests==2.26.0 # via coveralls six==1.16.0 # via @@ -97,21 +109,31 @@ six==1.16.0 # virtualenv smmap==4.0.0 # via gitdb -stevedore==3.3.0 +stevedore==3.4.0 # via bandit toml==0.10.2 # via - # black + # mypy # pre-commit # pytest +tomli==1.2.1 + # via black typed-ast==1.4.3 - # via mypy + # via + # black + # mypy typing-extensions==3.10.0.0 - # via mypy -urllib3==1.26.5 + # via + # black + # gitpython + # importlib-metadata + # mypy +urllib3==1.26.6 # via requests -virtualenv==20.4.6 +virtualenv==20.7.2 # via pre-commit +zipp==3.5.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # setuptools diff --git a/requirements.txt b/requirements.txt index 365a479a..f6534cc8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --no-emit-index-url --output-file=requirements.txt requirements.in # -bleach==3.3.0 +bleach==4.1.0 # via readme-renderer boto3-stubs[dynamodb,iam,sns,sqs]==1.17.71 # via -r requirements.in @@ -14,56 +14,50 @@ boto3==1.17.71 # cloudaux boto==2.49.0 # via cloudaux -botocore==1.20.72 +botocore==1.20.112 # via # boto3 # cloudaux # s3transfer -certifi==2020.12.5 +certifi==2021.5.30 # via requests -cffi==1.14.5 - # via cryptography -chardet==4.0.0 +charset-normalizer==2.0.4 # via requests -click==8.0.0 +click==8.0.1 # via # -r requirements.in # pip-tools -cloudaux==1.9.3 +cloudaux==1.9.6 # via -r requirements.in colorama==0.4.4 # via twine -cryptography==3.4.7 - # via secretstorage defusedxml==0.7.1 # via cloudaux docutils==0.17.1 # via readme-renderer flagpole==1.1.1 # via cloudaux -idna==2.10 +idna==3.2 # via requests import-string==0.1.0 # via -r requirements.in -importlib-metadata==4.0.1 +importlib-metadata==4.6.4 # via + # click # keyring + # pep517 # twine inflection==0.5.1 # via cloudaux -jeepney==0.6.0 - # via - # keyring - # secretstorage jmespath==0.10.0 # via # boto3 # botocore joblib==1.0.1 # via cloudaux -json-log-formatter==0.3.1 +json-log-formatter==0.4.0 # via -r requirements.in -keyring==23.0.1 +keyring==23.1.0 # via twine mypy-boto3-dynamodb==1.17.71 # via boto3-stubs @@ -73,25 +67,23 @@ mypy-boto3-sns==1.17.71 # via boto3-stubs mypy-boto3-sqs==1.17.71 # via boto3-stubs -packaging==20.9 +packaging==21.0 # via bleach -pep517==0.10.0 +pep517==0.11.0 # via pip-tools -pip-tools==6.1.0 +pip-tools==6.2.0 # via -r requirements.in -pkginfo==1.7.0 +pkginfo==1.7.1 # via twine -policyuniverse==1.3.5.20210511 +policyuniverse==1.4.0.20210816 # via -r requirements.in -pycparser==2.20 - # via cffi pydantic==1.8.2 # via -r requirements.in -pygments==2.9.0 +pygments==2.10.0 # via readme-renderer pyparsing==2.4.7 # via packaging -python-dateutil==2.8.1 +python-dateutil==2.8.2 # via # -r requirements.in # botocore @@ -103,7 +95,7 @@ readme-renderer==29.0 # via twine requests-toolbelt==0.9.1 # via twine -requests==2.25.1 +requests==2.26.0 # via # -r requirements.in # requests-toolbelt @@ -112,8 +104,6 @@ rfc3986==1.5.0 # via twine s3transfer==0.4.2 # via boto3 -secretstorage==3.3.1 - # via keyring six==1.16.0 # via # bleach @@ -125,26 +115,38 @@ tabulate==0.8.9 # via -r requirements.in tabview==1.4.4 # via -r requirements.in -toml==0.10.2 +tomli==1.2.1 # via pep517 -tqdm==4.60.0 +tqdm==4.62.2 # via # -r requirements.in # twine -twine==3.4.1 +twine==3.4.2 # via -r requirements.in -types-click==0.1.13 +types-click==7.1.5 # via -r requirements.in typing-extensions==3.10.0.0 - # via pydantic -urllib3==1.26.5 + # via + # boto3-stubs + # importlib-metadata + # mypy-boto3-dynamodb + # mypy-boto3-iam + # mypy-boto3-sns + # mypy-boto3-sqs + # pydantic +urllib3==1.26.6 # via # botocore # requests webencodings==0.5.1 # via bleach -zipp==3.4.1 - # via importlib-metadata +wheel==0.37.0 + # via pip-tools +zipp==3.5.0 + # via + # importlib-metadata + # pep517 # The following packages are considered to be unsafe in a requirements file: # pip +# setuptools