diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 335e9713a44..a0fb42d6104 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -6,7 +6,7 @@ repos: hooks: - id: prettier additional_dependencies: - - prettier@3.3.0 # npm + - prettier@3.3.3 # npm - repo: https://github.com/pre-commit/pre-commit-hooks rev: v4.6.0 hooks: @@ -50,7 +50,7 @@ repos: hooks: - id: git-check - repo: https://github.com/python-jsonschema/check-jsonschema - rev: 0.28.4 + rev: 0.28.6 hooks: - id: check-github-workflows - id: check-jsonschema diff --git a/Dockerfile b/Dockerfile index 32e058cbdba..e4d8706ef24 100644 --- a/Dockerfile +++ b/Dockerfile @@ -163,6 +163,9 @@ RUN --mount=type=cache,target=/root/.cache \ --mount=type=bind,from=poetry,source=/tmp,target=/poetry \ python3 -m pip install --disable-pip-version-check --no-deps --requirement=/poetry/requirements-dev.txt +# hadolint ignore=DL3003 +RUN cd /usr/local/lib/python3.12/dist-packages/c2cwsgiutils/acceptance/ && npm install + COPY . ./ RUN --mount=type=cache,target=/root/.cache \ POETRY_DYNAMIC_VERSIONING_BYPASS=0.0.0 python3 -m pip install --disable-pip-version-check --no-deps --editable=. \ diff --git a/acceptance_tests/logs-error.mask.png b/acceptance_tests/logs-error.mask.png index 8e68aebdf07..5d9fc5f3aeb 100644 Binary files a/acceptance_tests/logs-error.mask.png and b/acceptance_tests/logs-error.mask.png differ diff --git a/acceptance_tests/project.expected.png b/acceptance_tests/project.expected.png index 1fd8c7301ec..5212355d24d 100644 Binary files a/acceptance_tests/project.expected.png and b/acceptance_tests/project.expected.png differ diff --git a/ci/config.yaml b/ci/config.yaml index 3aba8975a50..00695c2792e 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.20/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 c168ac8b52f..77b5905d577 100644 --- a/ci/requirements.txt +++ b/ci/requirements.txt @@ -1,4 +1,4 @@ -c2cciutils[checks,publish]==1.6.20 +c2cciutils[checks,publish]==1.6.22 importlib-metadata<8.0.0 # issue with twine, see: https://github.com/python/importlib_metadata/issues/492 poetry==1.8.3 pre-commit==3.7.1 diff --git a/github_app_geo_project/views/home.py b/github_app_geo_project/views/home.py index 150201a7fa9..6ee0e996bd4 100644 --- a/github_app_geo_project/views/home.py +++ b/github_app_geo_project/views/home.py @@ -85,11 +85,13 @@ def output(request: pyramid.request.Request) -> dict[str, Any]: if admin: try: - github = ( - configuration.get_github_application(request.registry.settings, app) if admin else None - ) - if "TEST_APPLICATION" not in os.environ: + github = ( + configuration.get_github_application(request.registry.settings, app) + if admin + else None + ) + github_events = set(github.integration.get_app().events) # test that all events are in github_events if not events.issubset(github_events):