Skip to content

Commit

Permalink
Merge pull request #451 from camptocamp/renovate/patch-ci-dependencies
Browse files Browse the repository at this point in the history
Update CI dependencies (patch)
  • Loading branch information
sbrunner authored Aug 6, 2024
2 parents cdaffe6 + aa2d97e commit d4b3101
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ repos:
hooks:
- id: prettier
additional_dependencies:
- [email protected].0 # npm
- [email protected].3 # npm
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.6.0
hooks:
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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=. \
Expand Down
Binary file modified acceptance_tests/logs-error.mask.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified acceptance_tests/project.expected.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion ci/config.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ci/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 6 additions & 4 deletions github_app_geo_project/views/home.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit d4b3101

Please sign in to comment.