Merge pull request #1211 from Tecnativa/fix-ci

[FIX] bump Poetry to 2.1+ to support poetry-plugin-export

Author: josep-tecnativa

Dockerfile

@@ -2,8 +2,8 @@ FROM python:3.14.1-slim AS builder
 
 WORKDIR /app
 ADD pyproject.toml poetry.lock ./
-RUN pip install --no-cache-dir poetry==2.0.1
-RUN poetry self add poetry-plugin-export
+RUN pip install --no-cache-dir poetry==2.1.1
+RUN poetry self add "poetry-plugin-export==1.10.0"
 
 # Build a requirements.txt file matching poetry.lock, that pip understands
 # Test comment

poetry.lock

@@ -9,8 +9,8 @@ authors = ["Tecnativa"]
 atom = "^0.12.1"
 azure-core = ">=1.38.0"
 python = ">=3.10,<3.15"
-b2 = {version = "^3.4.0", optional = true}
-b2sdk = {version = "1.16.0", optional = true}
+b2 = {version = ">=3.19.1,<4", optional = true}
+b2sdk = {version = ">=2.1.0,<3", optional = true}
 boto = {version = "^2.49.0", optional = true}
 boto3 = {version = "^1.40.63", optional = true}
 gdata = {version = "^2.0.18", optional = true}

pyproject.toml

@@ -1,5 +1,6 @@
 import json
 import logging
+import os
 from contextlib import contextmanager
 from pathlib import Path
 from time import sleep
@@ -35,6 +36,13 @@ def pytest_addoption(parser):
 def image(request):
     """Get image name. Builds it if needed."""
     image_name = request.config.getoption("--image")
+
+    # If running under pytest-xdist, make image tags unique per worker to avoid
+    # concurrent "image already exists" collisions during docker build/export.
+    worker_id = os.environ.get("PYTEST_XDIST_WORKER")
+    if worker_id and worker_id != "master":
+        image_name = f"{image_name}-{worker_id}"
+
     if request.config.getoption("--prebuild"):
         for tag in [
             "docker-s3",
@@ -57,8 +65,6 @@ def image(request):
             ]
             retcode, stdout, stderr = build.run()
             _logger.log(
-                # Pytest prints warnings if a test fails, so this is a warning if
-                # the build succeeded, to allow debugging the build logs
                 logging.ERROR if retcode else logging.WARNING,
                 "Build logs for COMMAND: %s\nEXIT CODE:%d\nSTDOUT:%s\nSTDERR:%s",
                 build.bound_command(),
@@ -101,6 +107,31 @@ def _container(tag_name, dbver=None):
     return _container
 
 
+def _normalize_inspect_ip(container_info: dict) -> dict:
+    """Ensure container_info['NetworkSettings']['IPAddress'] exists.
+
+    Newer Docker versions (and user-defined networks) may leave
+    NetworkSettings.IPAddress empty / absent. The per-network IP lives in
+    NetworkSettings.Networks[<name>].IPAddress.
+    """
+    ns = container_info.get("NetworkSettings") or {}
+    # If IPAddress is already present and non-empty, keep it.
+    ip = ns.get("IPAddress")
+    if ip:
+        return container_info
+
+    networks = ns.get("Networks") or {}
+    for net_data in networks.values():
+        cand = (net_data or {}).get("IPAddress")
+        if cand:
+            ns["IPAddress"] = cand
+            container_info["NetworkSettings"] = ns
+            return container_info
+
+    # No IP found; leave as-is (tests will fail with clearer error later).
+    return container_info
+
+
 @pytest.fixture
 def postgres_factory():
     """Give a running postgres container ID."""
@@ -116,6 +147,7 @@ def _container_info(dbver):
             f"postgres:{dbver or pytest.MIN_PG}-alpine",
         ).strip()
         container_info = json.loads(docker("container", "inspect", container_id))[0]
+        container_info = _normalize_inspect_ip(container_info)
         for attempt in range(10):
             _logger.debug("Attempt %d of waiting for postgres to start.", attempt)
             try: