refactor: experiment with simplifying build using unreliable markers which seems to work with ibm specifically

Author: terry-docker

Dockerfile

@@ -1,8 +1,5 @@
 ARG PYTHON_VERSION=3.10
 FROM python:${PYTHON_VERSION}-slim-bookworm
-ARG POETRY_EXTRAS
-
-ENV PYTHONPATH=/workspace
 
 ENV POETRY_NO_INTERACTION=1 \
     POETRY_VIRTUALENVS_IN_PROJECT=1 \
@@ -23,18 +20,10 @@ RUN bash -c 'python -m venv /opt/poetry-venv && source $_/bin/activate && pip in
 # install dependencies with poetry
 COPY pyproject.toml .
 COPY poetry.lock .
-RUN if [ "$POETRY_EXTRAS" = "" ]; then \
-        poetry install --all-extras --with dev --no-root; \
-    else \
-        poetry install --extras "$POETRY_EXTRAS" --with dev --no-root; \
-    fi
+RUN poetry install --all-extras --with dev --no-root
 
 # copy project source
 COPY . .
 
 # install project with poetry
-RUN if [ "$POETRY_EXTRAS" = "" ]; then \
-        poetry install --all-extras --with dev; \
-    else \
-        poetry install --extras "$POETRY_EXTRAS" --with dev; \
-    fi
+RUN poetry install --all-extras --with dev

Makefile

@@ -3,26 +3,15 @@
 
 PYTHON_VERSION ?= 3.10
 IMAGE = testcontainers-python:${PYTHON_VERSION}
-PACKAGES = core $(addprefix modules/,$(notdir $(filter %/, $(wildcard modules/*/))))
+PACKAGES = core $(addprefix modules/,$(notdir $(wildcard modules/*)))
 
 UPLOAD = $(addsuffix /upload,${PACKAGES})
 TESTS = $(addsuffix /tests,$(filter-out meta,$(filter-out %.md %.txt,${PACKAGES})))
 TESTS_DIND = $(addsuffix -dind,${TESTS})
 DOCTESTS = $(addsuffix /doctests,$(filter-out modules/README.md,${PACKAGES}))
 
-ARCH := $(shell uname -m)
-ARM_ARCHS := arm64 aarch64
-IS_ARM := $(filter $(ARCH),$(ARM_ARCHS))
-
-# List of safe extras (excluding 'db2') with original TOML keys
-EXTRAS_LIST := $(shell $(PYTHON) scripts/list_arm_extras.py)
-
 install:  ## Set up the project for development
-ifeq ($(IS_ARM),$(ARCH))
-	poetry install $(foreach extra,$(EXTRAS_LIST),--extras $(extra))
-else
 	poetry install --all-extras
-endif
 	poetry run pre-commit install
 
 build:  ## Build the python package

core/__init__.py

@@ -3,11 +3,8 @@
 import pytest
 from typing import Callable
 from testcontainers.core.container import DockerClient
-from testcontainers.core.utils import is_arm
 import sys
 
-from .list_arm_extras import get_arm_extras
-
 PROJECT_DIR = Path(__file__).parent.parent.parent.resolve()
 
 
@@ -27,16 +24,11 @@ def python_testcontainer_image() -> str:
     py_version = ".".join(map(str, sys.version_info[:2]))
     image_name = f"testcontainers-python:{py_version}"
     client = DockerClient()
-    build_args = {"PYTHON_VERSION": py_version}
-
-    if is_arm():
-        build_args["POETRY_EXTRAS"] = get_arm_extras()
-
     client.build(
         path=str(PROJECT_DIR),
         tag=image_name,
         rm=False,
-        buildargs=build_args,
+        buildargs={"PYTHON_VERSION": py_version},
     )
     return image_name
 

core/tests/__init__.py

@@ -118,7 +118,7 @@ httpx = { version = "*", optional = true }
 azure-cosmos = { version = "*", optional = true }
 cryptography = { version = "*", optional = true }
 trino = { version = "*", optional = true }
-ibm_db_sa = { version = "*", optional = true }
+ibm_db_sa = { version = "*", optional = true, markers = "platform_machine != 'aarch64' and platform_machine != 'arm64'" }
 
 [tool.poetry.extras]
 arangodb = ["python-arango"]