Merge pull request #235 from dcermak/use-removeprefix

Use partion & add python 3.13

.github/workflows/ci.yml

@@ -107,7 +107,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         container_runtime: ["podman", "docker"]
         update_runtime: [ true, false ]
         without_buildah: [ false ]
@@ -137,13 +137,17 @@ jobs:
             python_version: "3.12"
             update_runtime: true
             without_buildah: false
+          - container_runtime: "docker"
+            python_version: "3.13"
+            update_runtime: true
+            without_buildah: false
 
         include:
-          - python_version: "3.12"
+          - python_version: "3.13"
             container_runtime: "podman"
             update_runtime: true
             without_buildah: true
-          - python_version: "3.12"
+          - python_version: "3.13"
             container_runtime: "podman"
             update_runtime: false
             without_buildah: true
@@ -243,7 +247,7 @@ jobs:
       fail-fast: false
       matrix:
         os_version: ["ubuntu-latest"]
-        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python_version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13"]
         include:
           - os_version: "ubuntu-20.04"
             python_version: "3.6"

noxfile.py

@@ -5,7 +5,7 @@
 from nox_poetry import session
 
 
-@session(python=["3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"])
+@session(python=["3.13", "3.12", "3.11", "3.10", "3.9", "3.8", "3.7", "3.6"])
 @nox.parametrize(
     "container_runtime",
     [nox.param(runtime, id=runtime) for runtime in ("podman", "docker")],

pyproject.toml

@@ -21,6 +21,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Software Development :: Quality Assurance",
     "Topic :: Software Development :: Testing"
 ]

pytest_container/__init__.py

@@ -2,6 +2,28 @@
 images or software in container images with pytest.
 
 """
+from .build import GitRepositoryBuild
+from .build import MultiStageBuild
+from .container import BindMount
+from .container import Container
+from .container import container_and_marks_from_pytest_param
+from .container import container_from_pytest_param
+from .container import container_to_pytest_param
+from .container import ContainerVolume
+from .container import DerivedContainer
+from .helpers import add_extra_run_and_build_args_options
+from .helpers import add_logging_level_options
+from .helpers import auto_container_parametrize
+from .helpers import get_extra_build_args
+from .helpers import get_extra_run_args
+from .helpers import set_logging_level_from_cli_args
+from .inspect import PortForwarding
+from .runtime import DockerRuntime
+from .runtime import get_selected_runtime
+from .runtime import OciRuntimeBase
+from .runtime import PodmanRuntime
+from .runtime import Version
+
 __all__ = [
     "GitRepositoryBuild",
     "MultiStageBuild",
@@ -22,24 +44,6 @@
     "OciRuntimeBase",
     "PodmanRuntime",
     "Version",
+    "ContainerVolume",
+    "BindMount",
 ]
-
-from .build import GitRepositoryBuild
-from .build import MultiStageBuild
-from .container import Container
-from .container import container_and_marks_from_pytest_param
-from .container import container_from_pytest_param
-from .container import container_to_pytest_param
-from .container import DerivedContainer
-from .helpers import add_extra_run_and_build_args_options
-from .helpers import add_logging_level_options
-from .helpers import auto_container_parametrize
-from .helpers import get_extra_build_args
-from .helpers import get_extra_run_args
-from .helpers import set_logging_level_from_cli_args
-from .inspect import PortForwarding
-from .runtime import DockerRuntime
-from .runtime import get_selected_runtime
-from .runtime import OciRuntimeBase
-from .runtime import PodmanRuntime
-from .runtime import Version

pytest_container/container.py

@@ -499,9 +499,12 @@ class ContainerBase:
     _is_local: bool = False
 
     def __post_init__(self) -> None:
-        if self.url.split(":", maxsplit=1)[0] == "containers-storage":
+        local_prefix = "containers-storage:"
+        if self.url.startswith(local_prefix):
             self._is_local = True
-            self.url = self.url.replace("containers-storage:", "")
+            # returns before_separator, separator, after_separator
+            before, sep, self.url = self.url.partition(local_prefix)
+            assert before == "" and sep == local_prefix
 
     def __str__(self) -> str:
         return self.url or self.container_id

source/prerequisites.rst

@@ -9,7 +9,8 @@ the `dataclasses <https://pypi.org/project/dataclasses/>`_ module.
 Tests leveraging `pytest_container` need to have access to a container
 runtime. Currently the following ones are supported:
 
-- `podman <https://podman.io/>`_ and `buildah <https://buildah.io/>`_
+- `podman <https://podman.io/>`_ and `buildah <https://buildah.io/>`_ (buildah
+  is optional and if missing, podman is leveraged for building container images)
 - `docker <https://www.docker.com/>`_
 
 .. _runtime selection rules:

tests/test_container.py

@@ -136,3 +136,11 @@ def test_baseurl(
     container_instance: Union[DerivedContainer, Container], url: Optional[str]
 ) -> None:
     assert container_instance.baseurl == url
+
+
+def test_url_does_not_loose_containers_storage_part():
+    local_prefix = "containers-storage"
+    path = f"this/is/a/fake/image/with/{local_prefix}:latest"
+    ctr = Container(url=f"{local_prefix}:{path}")
+    assert ctr.local_image
+    assert ctr.url == path