From 7956c337b13b187c0a10fa37ee9eb4f4412a9f1f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Aug 2024 08:08:57 +0000 Subject: [PATCH 1/2] Update CI dependencies to v1.6.22 --- ci/config.yaml | 2 +- ci/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/config.yaml b/ci/config.yaml index 07ab6620a..b451437b2 100644 --- a/ci/config.yaml +++ b/ci/config.yaml @@ -1,4 +1,4 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.21/c2cciutils/schema.json +# yaml-language-server: $schema=https://raw.githubusercontent.com/camptocamp/c2cciutils/1.6.22/c2cciutils/schema.json publish: docker: diff --git a/ci/requirements.txt b/ci/requirements.txt index 6c67c0b2c..1e808d239 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -c2cciutils[checks,publish]==1.6.21 +c2cciutils[checks,publish]==1.6.22 poetry-dynamic-versioning==1.4.0 poetry-plugin-export==1.8.0 poetry-plugin-tweak-dependencies-version==1.5.2 From 271a087f3ddb4abb5bcebf91a7e9d9c95d31d152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Tue, 6 Aug 2024 17:02:07 +0200 Subject: [PATCH 2/2] Use Docker Compose version 2 --- Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 1346f9ef5..74eed1ae8 100644 --- a/Makefile +++ b/Makefile @@ -23,12 +23,12 @@ prospector: ## Run Prospector PHONY: tests tests: build ## Run the unit tests - docker-compose stop --timeout=0 - docker-compose down || true - docker-compose up -d + docker compose stop --timeout=0 + docker compose down || true + docker compose up -d # Wait for DB to be up - while ! docker-compose exec -T test psql -h db -p 5432 -U postgresql -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ + while ! docker compose exec -T test psql -h db -p 5432 -U postgresql -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ do \ echo "Waiting for DB to be UP"; \ sleep 1; \ @@ -36,22 +36,22 @@ tests: build ## Run the unit tests c2cciutils-docker-logs - docker-compose exec -T test pytest -vv --color=yes + docker compose exec -T test pytest -vv --color=yes c2cciutils-docker-logs - docker-compose down + docker compose down PYTEST_ARGS ?= --last-failed PHONY: tests-fast tests-fast: - docker-compose up -d + docker compose up -d # Wait for DB to be up - while ! docker-compose exec -T test psql -h db -p 5432 -U postgresql -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ + while ! docker compose exec -T test psql -h db -p 5432 -U postgresql -v ON_ERROR_STOP=1 -c "SELECT 1" -d tests; \ do \ echo "Waiting for DB to be UP"; \ sleep 1; \ done - docker-compose exec -T test pytest -vvv --color=yes $(PYTEST_ARGS) + docker compose exec -T test pytest -vvv --color=yes $(PYTEST_ARGS)