chore: update poetry and tests to support arm machines

Author: terry-docker

Makefile

@@ -3,16 +3,28 @@
 
 PYTHON_VERSION ?= 3.10
 IMAGE = testcontainers-python:${PYTHON_VERSION}
-PACKAGES = core $(addprefix modules/,$(notdir $(wildcard modules/*)))
+PACKAGES = core $(addprefix modules/,$(notdir $(filter %/, $(wildcard modules/*/))))
 
 UPLOAD = $(addsuffix /upload,${PACKAGES})
-TESTS = $(addsuffix /tests,$(filter-out meta,${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))
+	@echo "Detected ARM architecture, skipping 'db2' extra (ibm-db is incompatible)"
+	poetry install $(foreach extra,$(EXTRAS_LIST),--extras $(extra))
+else
+	@echo "Detected non-ARM architecture, installing all extras"
 	poetry install --all-extras
+endif
 	poetry run pre-commit install
 
 build:  ## Build the python package

core/tests/test_utils.py

@@ -33,7 +33,6 @@ def test_is_windows(monkeypatch: MonkeyPatch) -> None:
 
 
 def test_is_arm(monkeypatch: MonkeyPatch) -> None:
-    assert not utils.is_arm()
     monkeypatch.setattr("platform.machine", lambda: "arm64")
     assert utils.is_arm()
     monkeypatch.setattr("platform.machine", lambda: "aarch64")

modules/cosmosdb/tests/test_cosmosdb_emulator.py

@@ -1,7 +1,10 @@
 import pytest
 from testcontainers.cosmosdb._emulator import CosmosDBEmulatorContainer
 
+from testcontainers.core.utils import is_arm
 
+
+@pytest.mark.skipif(is_arm(), reason="db2 container not available for ARM")
 def test_runs():
     with CosmosDBEmulatorContainer(partition_count=1, bind_ports=False) as emulator:
         assert emulator.server_certificate_pem is not None

modules/cosmosdb/tests/test_cosmosdb_mongodb.py

@@ -1,7 +1,10 @@
 import pytest
 from testcontainers.cosmosdb import CosmosDBMongoEndpointContainer
 
+from testcontainers.core.utils import is_arm
 
+
+@pytest.mark.skipif(is_arm(), reason="db2 container not available for ARM")
 def test_requires_a_version():
     with pytest.raises(AssertionError, match="A MongoDB version is required"):
         CosmosDBMongoEndpointContainer(mongodb_version=None)
@@ -10,6 +13,7 @@ def test_requires_a_version():
     CosmosDBMongoEndpointContainer(mongodb_version="4.0")
 
 
+@pytest.mark.skipif(is_arm(), reason="db2 container not available for ARM")
 def test_runs():
     with CosmosDBMongoEndpointContainer(mongodb_version="4.0", partition_count=1, bind_ports=False) as emulator:
         assert emulator.env["AZURE_COSMOS_EMULATOR_ENABLE_MONGODB_ENDPOINT"] == "4.0"

modules/cosmosdb/tests/test_cosmosdb_nosql.py

@@ -1,7 +1,10 @@
 import pytest
 from testcontainers.cosmosdb import CosmosDBNoSQLEndpointContainer
 
+from testcontainers.core.utils import is_arm
 
+
+@pytest.mark.skipif(is_arm(), reason="db2 container not available for ARM")
 def test_runs():
     with CosmosDBNoSQLEndpointContainer(partition_count=1, bind_ports=False) as emulator:
         assert emulator.get_exposed_port(8081) is not None, "The NoSQL endpoint's port should be exposed"

modules/db2/tests/test_db2.py

@@ -26,6 +26,7 @@ def test_docker_run_db2(version: str):
 # - sqlserver
 # - mongodb
 # - db2
+@pytest.mark.skipif(is_arm(), reason="db2 container not available for ARM")
 def test_quoted_password():
     user = "db2inst1"
     dbname = "testdb"

modules/elasticsearch/tests/test_elasticsearch.py

@@ -3,11 +3,13 @@
 
 import pytest
 
+from testcontainers.core.utils import is_arm
 from testcontainers.elasticsearch import ElasticSearchContainer
 
 
 # The versions below should reflect the latest stable releases
 @pytest.mark.parametrize("version", ["7.17.18", "8.12.2"])
+@pytest.mark.skipif(is_arm(), reason="db2 container not available for ARM")
 def test_docker_run_elasticsearch(version):
     with ElasticSearchContainer(f"elasticsearch:{version}", mem_limit="3G") as es:
         resp = urllib.request.urlopen(es.get_url())

modules/google/tests/test_google.py

@@ -1,6 +1,7 @@
 from queue import Queue
 from google.cloud.datastore import Entity
 
+import time
 from testcontainers.core.waiting_utils import wait_for_logs
 from testcontainers.google import PubSubContainer, DatastoreContainer
 
@@ -25,7 +26,8 @@ def test_pubsub_container():
         # Receive the message
         queue = Queue()
         subscriber.subscribe(subscription_path, queue.put)
-        message = queue.get(timeout=1)
+        # timeout 10 is needed to account for slower arm machines
+        message = queue.get(timeout=10)
         assert message.data == b"Hello world!"
         message.ack()
 

scripts/list_arm_extras.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3
+
+# used to generate the list of extras in the Makefile
+import sys
+from pathlib import Path
+
+# Support both Python 3.10 (needs tomli) and 3.11+ (has tomllib)
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    try:
+        import tomli as tomllib
+    except ImportError:
+        ## Python <3.11 detected but 'tomli' is not installed, poetry add --group dev tomli
+        sys.exit(1)
+
+SKIPPED_EXTRAS = {"db2"}  # skip incompatible extras
+
+
+def get_filtered_extras() -> list[str]:
+    with Path("pyproject.toml").open("rb") as f:
+        data = tomllib.load(f)
+    extras = data["tool"]["poetry"]["extras"]
+    return [key for key in extras if key not in SKIPPED_EXTRAS]
+
+
+if __name__ == "__main__":
+    sys.stdout.write(" ".join(get_filtered_extras()) + "\n")