From 11674caf189e683447b609955cc67b32f4e712b8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 06:19:01 +0000 Subject: [PATCH 1/3] 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 40fa9132..63a77acb 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 version: branch_to_version_re: diff --git a/ci/requirements.txt b/ci/requirements.txt index 70b69e51..ccfd1b3d 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 pre-commit==3.4.0 certifi>=2024.7.4 # not directly required, pinned by Snyk to avoid a vulnerability setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability From 045eadaf68d1f181b0aaa3108785c0a8af5199b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 7 Aug 2024 08:37:01 +0200 Subject: [PATCH 2/3] Use Docker Compose version 2 --- Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 1e7e0b15..515a4f0c 100644 --- a/Makefile +++ b/Makefile @@ -47,22 +47,22 @@ build-acceptance: acceptance: build-acceptance build # Run the acceptance tests C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \ C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \ - docker-compose up --detach - docker-compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance - docker-compose down + docker compose up --detach + docker compose exec -T tests pytest -vv --color=yes --junitxml /reports/acceptance.xml acceptance + docker compose down .PHONY: run run: build - docker-compose stop - docker-compose rm --force + docker compose stop + docker compose rm --force C2C_AUTH_GITHUB_CLIENT_ID=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-id) \ C2C_AUTH_GITHUB_CLIENT_SECRET=$(shell gopass show gs/projects/github/oauth-apps/geoservices-int/client-secret) \ - docker-compose up --detach + docker compose up --detach .PHONY: clean clean: rm -rf reports .venv - docker-compose down + docker compose down .PHONY: checks checks: prospector acceptance-prospector ## Run the checks From 806ccaa2002ccd83660b78310deefb01f4500806 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Brunner?= Date: Wed, 7 Aug 2024 08:48:20 +0200 Subject: [PATCH 3/3] Fix acceptances tests --- app/shared_config_manager/templates/source.html.mako | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/shared_config_manager/templates/source.html.mako b/app/shared_config_manager/templates/source.html.mako index 2a6f9296..319ce1d2 100644 --- a/app/shared_config_manager/templates/source.html.mako +++ b/app/shared_config_manager/templates/source.html.mako @@ -100,8 +100,8 @@ ${key_format(key) | h}: ${', '.join(value) | h}
%elif isinstance(value, dict): ${key_format(key) | h}:
- %for k, v in value.items(): -     ${k | h} = ${v | h}
+ %for k in sorted(value.keys()): +     ${k | h} = ${value[k] | h}
%endfor %else: ${key_format(key) | h}: ${value | h}