some docker compose fixes, trying to repair poetry

alercebroker · Aug 19, 2024 · c6c1c6e · c6c1c6e
1 parent 9962e1c
commit c6c1c6e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 5 deletions.
diff --git a/correction_step/tests/integration/conftest.py b/correction_step/tests/integration/conftest.py
@@ -13,6 +13,12 @@
 from tests.utils import atlas_extra_fields, lsst_extra_fields, ztf_extra_fields
 
 
+@pytest.fixture(scope="session")
+def docker_compose_command():
+    version = os.getenv("COMPOSE", "v2")
+    return "docker compose" if version == "v2" else "docker-compose"
+
+
 @pytest.fixture(scope="session")
 def docker_compose_file(pytestconfig):
     return (pathlib.Path(pytestconfig.rootdir) / "tests/integration/docker-compose.yaml").absolute()

diff --git a/libs/apf/poetry.lock b/libs/apf/poetry.lock
diff --git a/libs/apf/pyproject.toml b/libs/apf/pyproject.toml
@@ -13,7 +13,7 @@ click = ">=7.1.1"
 confluent-kafka = ">=1.4.0,<2.1.0"
 fastavro = ">=0.22.0,<=1.6.1"
 jinja2 = ">=2.10.0"
-pandas = ">=1.2,<=2.0.1"
+pandas = ">=1.2,<=2.2.1"
 boto3 = "1.26.69"
 prometheus-client = "0.16.0"
 pyroscope-io = "0.8.4"

diff --git a/reflector_step/tests/conftest.py b/reflector_step/tests/conftest.py
@@ -3,6 +3,12 @@
 from confluent_kafka.admin import AdminClient, NewTopic
 
 
+@pytest.fixture(scope="session")
+def docker_compose_command():
+    version = os.getenv("COMPOSE", "v2")
+    return "docker compose" if version == "v2" else "docker-compose"
+
+
 @pytest.fixture(scope="session")
 def docker_compose_file(pytestconfig):
     try:

diff --git a/sorting_hat_step/sorting_hat_step/utils/wizard.py b/sorting_hat_step/sorting_hat_step/utils/wizard.py
@@ -199,9 +199,9 @@ def generate_new_id(alerts: pd.DataFrame):
     count = 0
     for oid, group in alerts_wo_aid.groupby("oid"):
         id_ = id_generator(group["ra"].iloc[0], group["dec"].iloc[0])
-        alerts_wo_aid.loc[
-            group.index, "aid"
-        ] = f"AL{time.strftime('%y')}{encode(id_)}"
+        alerts_wo_aid.loc[group.index, "aid"] = (
+            f"AL{time.strftime('%y')}{encode(id_)}"
+        )
         count += 1
 
     logger.debug(

diff --git a/xmatch_step/tests/integration/conftest.py b/xmatch_step/tests/integration/conftest.py
@@ -4,6 +4,12 @@
 from confluent_kafka.admin import AdminClient, NewTopic
 
 
+@pytest.fixture(scope="session")
+def docker_compose_command():
+    version = os.getenv("COMPOSE", "v2")
+    return "docker compose" if version == "v2" else "docker-compose"
+
+
 @pytest.fixture(scope="session")
 def docker_compose_file(pytestconfig):
     return os.path.join(