Merge branch 'main' into copy_file_tests

Author: rhoban13

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-    ".": "4.12.0"
+    ".": "4.13.2"
 }

.github/workflows/ci-core.yml

@@ -14,7 +14,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.11", "3.12", "3.13"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
@@ -24,7 +24,7 @@ jobs:
       - name: Install Python dependencies
         run: poetry install --all-extras
       - name: Run twine check
-        run: poetry build && poetry run twine check dist/*.tar.gz
+        run: rm -f LICENSE.txt && poetry build && poetry run twine check dist/*.tar.gz
       - name: Set up Docker
         uses: docker/setup-docker-action@v4
       - name: Run tests

CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [4.13.2](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.13.1...testcontainers-v4.13.2) (2025-10-07)
+
+
+### Bug Fixes
+
+* **core:** Fix issues with doctests ([#893](https://github.com/testcontainers/testcontainers-python/issues/893)) ([2e4d80a](https://github.com/testcontainers/testcontainers-python/commit/2e4d80ade5a2048c8bc79d7a2438004b8e0954e4))
+* **core:** waiting improvements + remove decorators in core ([#894](https://github.com/testcontainers/testcontainers-python/issues/894)) ([f93f379](https://github.com/testcontainers/testcontainers-python/commit/f93f379380a9de769fe6a1e1168622865cdf613d))
+* issue [#889](https://github.com/testcontainers/testcontainers-python/issues/889) by changing the annotated return type of `waiting_for` to `Self`. ([#890](https://github.com/testcontainers/testcontainers-python/issues/890)) ([fe941b1](https://github.com/testcontainers/testcontainers-python/commit/fe941b17bb97aad15dc4844996f166c9308f4476))
+* **mongo:** mongo start waiting forever for old mongo versions ([#783](https://github.com/testcontainers/testcontainers-python/issues/783)) ([1388612](https://github.com/testcontainers/testcontainers-python/commit/13886120e9cb72666a40ea3691ea13e584805918))
+* **redpanda:** copy the startup script to a path that can be written … ([#867](https://github.com/testcontainers/testcontainers-python/issues/867)) ([e6b976d](https://github.com/testcontainers/testcontainers-python/commit/e6b976de43fc6fe90d7131fd25983f9c6b08429b))
+* **trino:** Remove deprecated class and decorator from Trino container ([#895](https://github.com/testcontainers/testcontainers-python/issues/895)) ([bb646e9](https://github.com/testcontainers/testcontainers-python/commit/bb646e903236a1df72bc38dbb47d1dba95527198))
+
+## [4.13.1](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.13.0...testcontainers-v4.13.1) (2025-09-24)
+
+
+### Bug Fixes
+
+* **core:** Added 'compose' in compose_command_property ([#879](https://github.com/testcontainers/testcontainers-python/issues/879)) ([769b7b6](https://github.com/testcontainers/testcontainers-python/commit/769b7b688fe254cb8e38e05f453c4e3fe7999ad5))
+* **core:** make sure context manager exits ([#876](https://github.com/testcontainers/testcontainers-python/issues/876)) ([10089f6](https://github.com/testcontainers/testcontainers-python/commit/10089f6e2fe07e53cc47a69521e67a1bf3310065))
+
+## [4.13.0](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.12.0...testcontainers-v4.13.0) (2025-08-27)
+
+
+### Features
+
+* **azurite:** Enhance connection string generation for network and local access ([#859](https://github.com/testcontainers/testcontainers-python/issues/859)) ([b21e5e3](https://github.com/testcontainers/testcontainers-python/commit/b21e5e38075ddbd71fb4f97e843abc104dec6beb))
+* **core:** add enhanced wait strategies ([#855](https://github.com/testcontainers/testcontainers-python/issues/855)) ([60d21f8](https://github.com/testcontainers/testcontainers-python/commit/60d21f875f49f52e170b0714e8790080a6cb4c71))
+* **core:** DockerCompose: support list of env_files ([#847](https://github.com/testcontainers/testcontainers-python/issues/847)) ([fe206eb](https://github.com/testcontainers/testcontainers-python/commit/fe206eb48ee9e18623761926900bfc33a8a869a7))
+
+
+### Bug Fixes
+
+* assert-in-get_container_host_ip-before-start ([#862](https://github.com/testcontainers/testcontainers-python/issues/862)) ([fc4155e](https://github.com/testcontainers/testcontainers-python/commit/fc4155eb70509ba236fff771c2f8973667acb098))
+* **core:** improper reading of .testcontainers.properties ([#863](https://github.com/testcontainers/testcontainers-python/issues/863)) ([350f246](https://github.com/testcontainers/testcontainers-python/commit/350f246a3b6367d727046b8967a63d1c055cf324))
+* **core:** Make TC_POOLING_INTERVAL/sleep_time a float ([#839](https://github.com/testcontainers/testcontainers-python/issues/839)) ([a072f3f](https://github.com/testcontainers/testcontainers-python/commit/a072f3fad46b3b3e7c5bea6255f27b79826aaf5f))
+
 ## [4.12.0](https://github.com/testcontainers/testcontainers-python/compare/testcontainers-v4.11.0...testcontainers-v4.12.0) (2025-07-21)
 
 

core/testcontainers/compose/compose.py

@@ -1,3 +1,4 @@
+import sys
 from dataclasses import asdict, dataclass, field, fields, is_dataclass
 from functools import cached_property
 from json import loads
@@ -35,8 +36,7 @@ def _ignore_properties(cls: type[_IPT], dict_: Any) -> _IPT:
 @dataclass
 class PublishedPortModel:
     """
-    Class that represents the response we get from compose when inquiring status
-    via `DockerCompose.get_running_containers()`.
+    Class that represents the response we get from compose when inquiring status via `DockerCompose.get_running_containers()`.
     """
 
     URL: Optional[str] = None
@@ -223,8 +223,12 @@ def __post_init__(self) -> None:
             self.env_file = [self.env_file]
 
     def __enter__(self) -> "DockerCompose":
-        self.start()
-        return self
+        try:
+            self.start()
+            return self
+        except:  # noqa: E722, RUF100
+            self.__exit__(*sys.exc_info())
+            raise
 
     def __exit__(
         self, exc_type: Optional[type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
@@ -242,7 +246,9 @@ def docker_compose_command(self) -> list[str]:
 
     @cached_property
     def compose_command_property(self) -> list[str]:
-        docker_compose_cmd = [self.docker_command_path] if self.docker_command_path else ["docker", "compose"]
+        docker_compose_cmd = (
+            [self.docker_command_path, "compose"] if self.docker_command_path else ["docker", "compose"]
+        )
         if self.compose_file_name:
             for file in self.compose_file_name:
                 docker_compose_cmd += ["-f", file]
@@ -256,6 +262,7 @@ def compose_command_property(self) -> list[str]:
     def waiting_for(self, strategies: dict[str, WaitStrategy]) -> "DockerCompose":
         """
         Set wait strategies for specific services.
+
         Args:
             strategies: Dictionary mapping service names to wait strategies
         """

core/testcontainers/core/container.py

@@ -1,6 +1,7 @@
 import contextlib
 import io
 import pathlib
+import sys
 import tarfile
 from os import PathLike
 from socket import socket
@@ -23,7 +24,7 @@
 from testcontainers.core.transferable import Transferable, TransferSpec
 from testcontainers.core.utils import is_arm, setup_logger
 from testcontainers.core.wait_strategies import LogMessageWaitStrategy
-from testcontainers.core.waiting_utils import WaitStrategy, wait_container_is_ready
+from testcontainers.core.waiting_utils import WaitStrategy
 
 if TYPE_CHECKING:
     from docker.models.containers import Container
@@ -42,15 +43,11 @@ class DockerContainer:
 
     Args:
         image: The name of the image to start.
-        docker_client_kw: Dictionary with arguments that will be passed to the
-            docker.DockerClient init.
+        docker_client_kw: Dictionary with arguments that will be passed to the docker.DockerClient init.
         command: Optional execution command for the container.
         name: Optional name for the container.
-        ports: Ports to be exposed by the container. The port number will be
-            automatically assigned on the host, use
-            :code:`get_exposed_port(PORT)` method to get the port number on the host.
-        volumes: Volumes to mount into the container. Each entry should be a tuple with
-            three values: host path, container path and. mode (default 'ro').
+        ports: Ports to be exposed by the container. The port number will be automatically assigned on the host, use :code:`get_exposed_port(PORT)` method to get the port number on the host.
+        volumes: Volumes to mount into the container. Each entry should be a tuple with three values: host path, container path and mode (default 'ro').
         network: Optional network to connect the container to.
         network_aliases: Optional list of aliases for the container in the network.
 
@@ -178,7 +175,7 @@ def maybe_emulate_amd64(self) -> Self:
             return self.with_kwargs(platform="linux/amd64")
         return self
 
-    def waiting_for(self, strategy: WaitStrategy) -> "DockerContainer":
+    def waiting_for(self, strategy: WaitStrategy) -> Self:
         """Set a wait strategy to be used after container start."""
         self._wait_strategy = strategy
         return self
@@ -229,7 +226,11 @@ def stop(self, force: bool = True, delete_volume: bool = True) -> None:
         self.get_docker_client().client.close()
 
     def __enter__(self) -> Self:
-        return self.start()
+        try:
+            return self.start()
+        except:  # noqa: E722, RUF100
+            self.__exit__(*sys.exc_info())
+            raise
 
     def __exit__(
         self, exc_type: Optional[type[BaseException]], exc_val: Optional[BaseException], exc_tb: Optional[TracebackType]
@@ -256,8 +257,13 @@ def get_container_host_ip(self) -> str:
             # ensure that we covered all possible connection_modes
             assert_never(connection_mode)
 
-    @wait_container_is_ready()
     def get_exposed_port(self, port: int) -> int:
+        from testcontainers.core.wait_strategies import ContainerStatusWaitStrategy as C
+
+        C().wait_until_ready(self)
+        return self._get_exposed_port(port)
+
+    def _get_exposed_port(self, port: int) -> int:
         if self.get_docker_client().get_connection_mode().use_mapped_port:
             c = self._container
             assert c is not None

core/testcontainers/core/docker_client.py

@@ -174,7 +174,7 @@ def get_container(self, container_id: str) -> dict[str, Any]:
         """
         Get the container with a given identifier.
         """
-        containers = self.client.api.containers(filters={"id": container_id})
+        containers = self.client.api.containers(all=True, filters={"id": container_id})
         if not containers:
             raise RuntimeError(f"Could not get container with id {container_id}")
         return cast("dict[str, Any]", containers[0])

core/testcontainers/core/generic.py

@@ -16,7 +16,6 @@
 from testcontainers.core.container import DockerContainer
 from testcontainers.core.exceptions import ContainerStartException
 from testcontainers.core.utils import raise_for_deprecated_parameter
-from testcontainers.core.waiting_utils import wait_container_is_ready
 
 ADDITIONAL_TRANSIENT_ERRORS = []
 try:
@@ -34,8 +33,11 @@ class DbContainer(DockerContainer):
     Generic database container.
     """
 
-    @wait_container_is_ready(*ADDITIONAL_TRANSIENT_ERRORS)
     def _connect(self) -> None:
+        from testcontainers.core.wait_strategies import ContainerStatusWaitStrategy as C
+
+        C().with_transient_exceptions(*ADDITIONAL_TRANSIENT_ERRORS).wait_until_ready(self)
+
         import sqlalchemy
 
         engine = sqlalchemy.create_engine(self.get_connection_url())