Using troposphere 4.5.1 (#691)

compose-x · Nov 1, 2023 · 975f1f0 · 975f1f0
1 parent 84e4ce1
commit 975f1f0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 2,389 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
@@ -19,14 +19,14 @@ repos:
       - id: fix-byte-order-marker
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.13.0
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         exclude: ^tests/
-        args: [ "--py38-plus", "--keep-runtime-typing" ]
+        args: [ "--py39-plus", "--keep-runtime-typing" ]
 
   - repo: https://github.com/psf/black
-    rev: 23.9.1
+    rev: 23.10.1
     hooks:
       - id: black
 

diff --git a/cli.Dockerfile b/cli.Dockerfile
@@ -1,5 +1,5 @@
 ARG ARCH=
-ARG PY_VERSION=3.9.16-slim
+ARG PY_VERSION=3.10-slim
 ARG BASE_IMAGE=public.ecr.aws/docker/library/python:$PY_VERSION
 ARG LAMBDA_IMAGE=public.ecr.aws/lambda/python:latest
 

diff --git a/ecs_composex/appmesh/appmesh_service.py b/ecs_composex/appmesh/appmesh_service.py
@@ -7,7 +7,8 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Mapping
+from collections.abc import Mapping
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from .appmesh_mesh import Mesh

diff --git a/ecs_composex/common/stacks/__init__.py b/ecs_composex/common/stacks/__init__.py
@@ -288,7 +288,7 @@ def set_vpc_parameters_from_vpc_stack(
         if (
             self.parent_stack
             and self.parent_stack is not None
-            and self.parent_stack != settings.root_stack
+            and id(self.parent_stack) != id(settings.root_stack)
         ):
             ref_params = {
                 VPC_ID_T: Ref(VPC_ID),

diff --git a/ecs_composex/elbv2/elbv2_stack/helpers.py b/ecs_composex/elbv2/elbv2_stack/helpers.py
@@ -125,9 +125,8 @@ def validate_listeners_duplicates(name, ports) -> None:
     :return:
     """
     if len(ports) != len(set(ports)):
-        s = set()
         raise ValueError(
-            f"{name} - More than one listener with port {set(x for x in ports if x in s or s.add(x))}"
+            f"{name} - More than one listener with port {{x for x in ports if x in s or s.add(x)}}"
         )
 
 

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,7 +37,7 @@ exclude = ["*.pyc", "*~", "*pycache*"]
 [tool.poetry.dependencies]
 python = "^3.8"
 boto3 = ">=1.28,<2.0"
-troposphere = "^4.4.1"
+troposphere = "4.5.1"
 ecr-scan-reporter = { version = "^0.4.8", optional = true }
 compose-x-render = "^0.6.1"
 compose-x-common = "^1.4"