Merge pull request #779 from awslabs/dependabot/pip/development-depen…

…dencies-985498a6e5 Bump the development-dependencies group across 1 directory with 11 updates
awslabs · Jan 23, 2025 · 720dd5d · 720dd5d
2 parents 3ad59bb + 4521bd5
commit 720dd5d
Showing 9 changed files with 65 additions and 50 deletions.
diff --git a/requirements-dev.in b/requirements-dev.in
@@ -2,22 +2,22 @@
 
 awscli>=1.35
 certifi~=2024.8.30
-check-manifest~=0.48
-mypy~=1.11
+check-manifest~=0.50
+mypy~=1.14
 pip-tools~=7.4.1
-pydot~=3.0.2
+pydot~=3.0.4
 pyroma~=4.0
-pytest~=8.3.3
-pytest-cov~=5.0.0
+pytest~=8.3.4
+pytest-cov~=6.0.0
 pytest-mock~=3.14.0
 pytest-ordering~=0.6
-ruff~=0.6.9
-twine~=5.1.1
+ruff~=0.9.2
+twine~=6.1.0
 types-PyYAML~=6.0.12
 types-requests~=2.31.0.6
-types-setuptools~=75.1.0
+types-setuptools~=75.8.0
 wheel~=0.44.0
-boto3-stubs[codebuild,iam,s3,secretsmanager,ssm,sts]~=1.35.34
-moto[s3,sts,iam,codebuild,secretsmanager,ssm]~=5.0.16
+boto3-stubs[codebuild,iam,s3,secretsmanager,ssm,sts]~=1.36.4
+moto[s3,sts,iam,codebuild,secretsmanager,ssm]~=5.0.27
 requests~=2.32.3
 werkzeug>=3.0.6
diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -8,11 +8,13 @@ awscli==1.37.0
     # via -r requirements-dev.in
 boto3==1.36.0
     # via
+    #   -c requirements.txt
     #   moto
-boto3-stubs[codebuild,iam,s3,secretsmanager,ssm,sts]==1.35.34
+boto3-stubs[codebuild,iam,s3,secretsmanager,ssm,sts]==1.36.4
     # via -r requirements-dev.in
 botocore==1.36.0
     # via
+    #   -c requirements.txt
     #   awscli
     #   boto3
     #   moto
@@ -26,17 +28,20 @@ build==1.2.1
     #   pyroma
 certifi==2024.8.30
     # via
+    #   -c requirements.txt
     #   -r requirements-dev.in
     #   requests
 cffi==1.16.0
     # via cryptography
 charset-normalizer==3.4.1
     # via
+    #   -c requirements.txt
     #   requests
-check-manifest==0.49
+check-manifest==0.50
     # via -r requirements-dev.in
 click==8.1.8
     # via
+    #   -c requirements.txt
     #   pip-tools
 colorama==0.4.6
     # via awscli
@@ -51,11 +56,12 @@ docutils==0.16
     #   awscli
     #   pyroma
     #   readme-renderer
+id==1.5.0
+    # via twine
 idna==3.10
     # via
+    #   -c requirements.txt
     #   requests
-importlib-metadata==8.0.0
-    # via twine
 iniconfig==2.0.0
     # via pytest
 jaraco-classes==3.4.0
@@ -70,69 +76,76 @@ jeepney==0.8.0
     #   secretstorage
 jinja2==3.1.5
     # via
+    #   -c requirements.txt
     #   moto
 jmespath==1.0.1
     # via
+    #   -c requirements.txt
     #   boto3
     #   botocore
 keyring==25.2.1
     # via twine
 markdown-it-py==3.0.0
     # via
+    #   -c requirements.txt
     #   rich
 markupsafe==3.0.2
     # via
+    #   -c requirements.txt
     #   jinja2
     #   werkzeug
 mdurl==0.1.2
     # via
+    #   -c requirements.txt
     #   markdown-it-py
 more-itertools==10.3.0
     # via
     #   jaraco-classes
     #   jaraco-functools
-moto[codebuild,iam,s3,secretsmanager,ssm,sts]==5.0.16
+moto[codebuild,iam,s3,secretsmanager,ssm,sts]==5.0.27
     # via -r requirements-dev.in
-mypy==1.11.2
+mypy==1.14.1
     # via -r requirements-dev.in
-mypy-boto3-codebuild==1.35.1
+mypy-boto3-codebuild==1.36.0
     # via boto3-stubs
-mypy-boto3-iam==1.35.0
+mypy-boto3-iam==1.36.0
     # via boto3-stubs
-mypy-boto3-s3==1.35.2
+mypy-boto3-s3==1.36.0
     # via boto3-stubs
-mypy-boto3-secretsmanager==1.35.0
+mypy-boto3-secretsmanager==1.36.0
     # via boto3-stubs
-mypy-boto3-ssm==1.35.0
+mypy-boto3-ssm==1.36.0
     # via boto3-stubs
-mypy-boto3-sts==1.35.0
+mypy-boto3-sts==1.36.0
     # via boto3-stubs
 mypy-extensions==1.0.0
     # via
+    #   -c requirements.txt
     #   mypy
 nh3==0.2.18
     # via readme-renderer
 packaging==24.2
     # via
+    #   -c requirements.txt
     #   build
     #   pyroma
     #   pytest
+    #   twine
 pip-tools==7.4.1
     # via -r requirements-dev.in
-pkginfo==1.10.0
-    # via twine
 pluggy==1.5.0
     # via pytest
-py-partiql-parser==0.5.6
+py-partiql-parser==0.6.1
     # via moto
 pyasn1==0.6.0
     # via rsa
 pycparser==2.22
     # via cffi
-pydot==3.0.2
+pydot==3.0.4
     # via -r requirements-dev.in
 pygments==2.19.1
     # via
+    #   -c requirements.txt
     #   pyroma
     #   readme-renderer
     #   rich
@@ -144,35 +157,36 @@ pyproject-hooks==1.1.0
     #   pip-tools
 pyroma==4.2
     # via -r requirements-dev.in
-pytest==8.3.3
+pytest==8.3.4
     # via
     #   -r requirements-dev.in
     #   pytest-cov
     #   pytest-mock
     #   pytest-ordering
-pytest-cov==5.0.0
+pytest-cov==6.0.0
     # via -r requirements-dev.in
 pytest-mock==3.14.0
     # via -r requirements-dev.in
 pytest-ordering==0.6
     # via -r requirements-dev.in
 python-dateutil==2.9.0.post0
     # via
-
+    #   -c requirements.txt
     #   botocore
     #   moto
 pyyaml==6.0.2
     # via
-
+    #   -c requirements.txt
     #   awscli
     #   moto
     #   responses
 readme-renderer==43.0
     # via twine
 requests==2.32.3
     # via
-
+    #   -c requirements.txt
     #   -r requirements-dev.in
+    #   id
     #   moto
     #   pyroma
     #   requests-toolbelt
@@ -186,41 +200,46 @@ rfc3986==2.0.0
     # via twine
 rich==13.9.4
     # via
+    #   -c requirements.txt
     #   twine
 rsa==4.7.2
     # via awscli
-ruff==0.6.9
+ruff==0.9.2
     # via -r requirements-dev.in
 s3transfer==0.11.0
     # via
+    #   -c requirements.txt
     #   awscli
     #   boto3
 secretstorage==3.3.3
     # via keyring
 six==1.17.0
     # via
+    #   -c requirements.txt
     #   python-dateutil
 trove-classifiers==2024.7.2
     # via pyroma
-twine==5.1.1
+twine==6.1.0
     # via -r requirements-dev.in
 types-awscrt==0.21.2
     # via botocore-stubs
-types-pyyaml==6.0.12.20240917
+types-pyyaml==6.0.12.20241230
     # via -r requirements-dev.in
 types-requests==2.31.0.6
     # via -r requirements-dev.in
 types-s3transfer==0.10.1
     # via boto3-stubs
-types-setuptools==75.1.0.20240917
+types-setuptools==75.8.0.20250110
     # via -r requirements-dev.in
 types-urllib3==1.26.25.14
     # via types-requests
 typing-extensions==4.12.2
     # via
+    #   -c requirements.txt
     #   mypy
 urllib3==1.26.20
     # via
+    #   -c requirements.txt
     #   botocore
     #   requests
     #   responses
@@ -235,8 +254,6 @@ wheel==0.44.0
     #   pip-tools
 xmltodict==0.13.0
     # via moto
-zipp==3.19.2
-    # via importlib-metadata
 
 # The following packages are considered to be unsafe in a requirements file:
 # pip

diff --git a/seedfarmer/cli_groups/_init_group.py b/seedfarmer/cli_groups/_init_group.py
@@ -72,9 +72,7 @@ def init_project(template_url: str, template_branch: str) -> None:
     "--template-url",
     "-t",
     default="https://github.com/awslabs/seed-farmer.git",
-    help=(
-        "The template URL. If not specified, the default template repo is " "`https://github.com/awslabs/seed-farmer`"
-    ),
+    help=("The template URL. If not specified, the default template repo is `https://github.com/awslabs/seed-farmer`"),
     required=False,
 )
 @click.option(

diff --git a/seedfarmer/commands/_stack_commands.py b/seedfarmer/commands/_stack_commands.py
@@ -113,7 +113,7 @@ def _get_docker_secret_inline_policy(docker_credentials_secret: str, session: Op
                         "secretsmanager:ListSecretVersionIds",
                     ],
                     "Resource": (
-                        f"arn:{partition}:secretsmanager:{region}:{account_id}" f":secret:{docker_credentials_secret}*"
+                        f"arn:{partition}:secretsmanager:{region}:{account_id}:secret:{docker_credentials_secret}*"
                     ),
                 },
                 {"Effect": "Allow", "Action": ["secretsmanager:ListSecrets"], "Resource": "*"},

diff --git a/seedfarmer/mgmt/module_info.py b/seedfarmer/mgmt/module_info.py
@@ -805,7 +805,7 @@ def get_module_stack_names(
     # Max length of a Stack Name is 128 chars, -iam-policy is 11 chars, resource_hash plus "-" is 5 chars
     # If the resource_name and "-iam-policy" is too long, truncate and use a resource_hash for uniqueness
     module_stack_name = (
-        f"{resource_name[:128 - 11 - 5]}-{resource_hash}-iam-policy"
+        f"{resource_name[: 128 - 11 - 5]}-{resource_hash}-iam-policy"
         if len(resource_name) > (128 - 11)
         else f"{resource_name}-iam-policy"
     )
@@ -814,7 +814,7 @@ def get_module_stack_names(
     # If the resource_name and session_hash is too long, truncate and use a resource_hash for uniqueness
     session_hash = generate_session_hash(session=session)
     module_role_name = (
-        f"{resource_name[:64 - 9 - 5]}-{resource_hash}-{session_hash}"
+        f"{resource_name[: 64 - 9 - 5]}-{resource_hash}-{session_hash}"
         if len(resource_name) > (64 - 9)
         else f"{resource_name}-{session_hash}"
     )

diff --git a/seedfarmer/models/manifests/_deployment_manifest.py b/seedfarmer/models/manifests/_deployment_manifest.py
@@ -144,7 +144,7 @@ def _get_value(self, value: Union[str, ValueFromRef]) -> str:  # type: ignore[ov
                 env_value = os.getenv(value.value_from.env_variable, None)
                 if env_value is None:
                     raise seedfarmer.errors.InvalidManifestError(
-                        ("Unable to resolve value from Environment Variable:" f" {value.value_from.env_variable}")
+                        (f"Unable to resolve value from Environment Variable: {value.value_from.env_variable}")
                     )
                 return env_value
             else:

diff --git a/seedfarmer/services/session_manager.py b/seedfarmer/services/session_manager.py
@@ -163,7 +163,7 @@ def get_deployment_session(self, account_id: str, region_name: str) -> Session:
                 qualifier=cast(str, qualifier),
             )
             _logger.debug(
-                f"""The assumed toolchain role {toolchain_role['AssumedRoleUser']['Arn']} will
+                f"""The assumed toolchain role {toolchain_role["AssumedRoleUser"]["Arn"]} will
                  try and assume the deployment role: {deployment_role_arn}"""
             )
             try:

diff --git a/seedfarmer/utils.py b/seedfarmer/utils.py
@@ -171,7 +171,7 @@ def get_generic_module_deployment_role_name(
     # Max length of IAM role name is 64 chars, "-deployment-role" is 16 chars, resource_hash plus "-" is 5 chars.
     # If the resource_name, and "-deployment-role" is too long, truncate and use resource_hash for uniqueness.
     return (
-        f"{resource_name[:64 - 16 - 5]}-deployment-role-{resource_hash}"
+        f"{resource_name[: 64 - 16 - 5]}-deployment-role-{resource_hash}"
         if len(resource_name) > (64 - 16)
         else f"{resource_name}-deployment-role"
     )

diff --git a/test/unit-test/test_cli_arg.py b/test/unit-test/test_cli_arg.py
@@ -1125,7 +1125,7 @@ def test_remove_moduledata(session_manager, mocker):
             "--target-account-id",
             "123456789012",
             "--target-region",
-            "us-east-1" "--debug",
+            "us-east-1--debug",
         ],
         exit_code=0,
     )
@@ -1235,7 +1235,7 @@ def test_store_md5_deployspec():
             "-m",
             "module-name",
             "-t",
-            "spec" "<<< f4k3h4shmd5",
+            "spec<<< f4k3h4shmd5",
         ],
         exit_code=0,
     )
@@ -1256,7 +1256,7 @@ def test_store_md5_bundle():
             "-m",
             "module-name",
             "--type",
-            "bundle" "<<< f4k3h4shbund13",
+            "bundle<<< f4k3h4shbund13",
         ],
         exit_code=0,
     )
@@ -1425,7 +1425,7 @@ def test_store_deployspec_missing_acct():
             "--project",
             "myapp",
             "--path",
-            "module/test/test" "--target_region",
+            "module/test/test--target_region",
             "us-east-1",
             "--debug",
         ],