Skip to content

Commit c6c1c6e

Browse files
committed
some docker compose fixes, trying to repair poetry
1 parent 9962e1c commit c6c1c6e

File tree

6 files changed

+23
-5
lines changed

6 files changed

+23
-5
lines changed

correction_step/tests/integration/conftest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313
from tests.utils import atlas_extra_fields, lsst_extra_fields, ztf_extra_fields
1414

1515

16+
@pytest.fixture(scope="session")
17+
def docker_compose_command():
18+
version = os.getenv("COMPOSE", "v2")
19+
return "docker compose" if version == "v2" else "docker-compose"
20+
21+
1622
@pytest.fixture(scope="session")
1723
def docker_compose_file(pytestconfig):
1824
return (pathlib.Path(pytestconfig.rootdir) / "tests/integration/docker-compose.yaml").absolute()

libs/apf/poetry.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

libs/apf/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ click = ">=7.1.1"
1313
confluent-kafka = ">=1.4.0,<2.1.0"
1414
fastavro = ">=0.22.0,<=1.6.1"
1515
jinja2 = ">=2.10.0"
16-
pandas = ">=1.2,<=2.0.1"
16+
pandas = ">=1.2,<=2.2.1"
1717
boto3 = "1.26.69"
1818
prometheus-client = "0.16.0"
1919
pyroscope-io = "0.8.4"

reflector_step/tests/conftest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
from confluent_kafka.admin import AdminClient, NewTopic
44

55

6+
@pytest.fixture(scope="session")
7+
def docker_compose_command():
8+
version = os.getenv("COMPOSE", "v2")
9+
return "docker compose" if version == "v2" else "docker-compose"
10+
11+
612
@pytest.fixture(scope="session")
713
def docker_compose_file(pytestconfig):
814
try:

sorting_hat_step/sorting_hat_step/utils/wizard.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ def generate_new_id(alerts: pd.DataFrame):
199199
count = 0
200200
for oid, group in alerts_wo_aid.groupby("oid"):
201201
id_ = id_generator(group["ra"].iloc[0], group["dec"].iloc[0])
202-
alerts_wo_aid.loc[
203-
group.index, "aid"
204-
] = f"AL{time.strftime('%y')}{encode(id_)}"
202+
alerts_wo_aid.loc[group.index, "aid"] = (
203+
f"AL{time.strftime('%y')}{encode(id_)}"
204+
)
205205
count += 1
206206

207207
logger.debug(

xmatch_step/tests/integration/conftest.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
from confluent_kafka.admin import AdminClient, NewTopic
55

66

7+
@pytest.fixture(scope="session")
8+
def docker_compose_command():
9+
version = os.getenv("COMPOSE", "v2")
10+
return "docker compose" if version == "v2" else "docker-compose"
11+
12+
713
@pytest.fixture(scope="session")
814
def docker_compose_file(pytestconfig):
915
return os.path.join(

0 commit comments

Comments
 (0)