Add/update pre-commit hooks

.github/renovate.json5

@@ -13,6 +13,13 @@
     schedule: 'after 5pm on the first day of the month',
   },
   baseBranches: ['master', '7.2', '7.4', '7.6', '7.6-20-04', '8.0'],
+  'pre-commit': { enabled: true },
+  regexManagers: [
+    {
+      fileMatch: ['^.pre-commit-config.yaml$'],
+      matchStrings: [" +- '?(?<depName>[^' @=]+)(@|==)(?<currentValue>[^' @=]+)'? # (?<datasource>.+)"],
+    },
+  ],
   packageRules: [
     /** Docker images versioning */
     {

.github/workflows/main.yaml

@@ -35,6 +35,16 @@ jobs:
       - run: echo "${HOME}/.local/bin" >> ${GITHUB_PATH}
       - run: python3 -m pip install --user --requirement=ci/requirements.txt
 
+      - uses: actions/cache@v3
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+          restore-keys: "pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}\npre-commit-"
+      - run: pre-commit run --all-files
+        env:
+          SKIP: poetry-lock
+      - run: git diff && false
+        if: failure()
       - name: Checks
         run: c2cciutils-checks
 

.pre-commit-config.yaml

@@ -5,3 +5,90 @@ repos:
       - id: prettier
         additional_dependencies:
           - [email protected]
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+      - id: detect-private-key
+      - id: check-merge-conflict
+      - id: check-ast
+      - id: debug-statements
+      - id: check-toml
+      - id: check-yaml
+      - id: check-json
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: mixed-line-ending
+  - repo: https://github.com/sbrunner/hooks
+    rev: 0.3.2
+    hooks:
+      - id: copyright
+      - id: poetry-check
+        additional_dependencies:
+          - poetry==1.3.2 # pypi
+        exclude: ^pyproject.toml$
+      - id: poetry-lock
+        additional_dependencies:
+          - poetry==1.3.2 # pypi
+        exclude: ^pyproject.toml$
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.2
+    hooks:
+      - id: codespell
+        exclude: |-
+          (?x)(
+            (.*/)?poetry\.lock
+            |.github/changelog-generator-cache/.*
+          )
+  - repo: https://github.com/shellcheck-py/shellcheck-py
+    rev: v0.9.0.2
+    hooks:
+      - id: shellcheck
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 3.0.0
+    hooks:
+      - id: git-check
+  - repo: https://github.com/python-jsonschema/check-jsonschema
+    rev: 0.20.0
+    hooks:
+      - id: check-github-actions
+      - id: check-github-workflows
+      - id: check-jsonschema
+        name: Check GitHub Workflows set timeout-minutes
+        files: ^\.github/workflows/[^/]+$
+        types:
+          - yaml
+        args:
+          - --builtin-schema
+          - github-workflows-require-timeout
+      - id: check-renovate
+        additional_dependencies:
+          - pyjson5==1.6.2 # pypi
+  - repo: https://github.com/sirwart/ripsecrets
+    rev: v0.1.5
+    hooks:
+      - id: ripsecrets
+  - repo: https://github.com/PyCQA/autoflake
+    rev: v2.0.0
+    hooks:
+      - id: autoflake
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+      - id: pyupgrade
+        args:
+          - --py38-plus
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
+  - repo: https://github.com/psf/black
+    rev: 22.12.0
+    hooks:
+      - id: black
+ci:
+  autoupdate_schedule: quarterly
+  skip:
+    - copyright
+    - poetry-check
+    - poetry-lock
+    - ripsecrets

README.md

@@ -61,3 +61,12 @@ your query string.
 - `confd` and `entrypoints.d` are removed, you should replace it by a `volume_from` a configuration image
   or an init container.
 - The `MS_MAPFILE` has no more default value, was `/etc/mapserver/mapserver.map`.
+
+## Contributing
+
+Install the pre-commit hooks:
+
+```bash
+pip install pre-commit
+pre-commit install --allow-missing-config
+```

acceptance_tests/test_wfs.py

@@ -1,6 +1,3 @@
-from xml.etree import ElementTree
-
-
 def test_get_feature(connection):
     answer = connection.get_xml(
         "?SERVICE=WFS&VERSION=2.0.0&REQUEST=GetFeature&TYPENAME=polygons&featureId=polygons.foo"

checkout_release

@@ -8,11 +8,15 @@ if [ "$#" -ne 1 ]; then
 fi
 
 BRANCH=$1
-TAG_PREFIX=$(echo $BRANCH | sed -e 's/branch-/rel-/')
+TAG_PREFIX=${BRANCH//branch-/rel-}
 
 git fetch --tags
-LAST_RELEASE=$(git log --format=%H --tags=$TAG_PREFIX* --no-walk | head -1)
-git checkout --detach $LAST_RELEASE
+LAST_RELEASE=$(git log --format=%H "--tags=$TAG_PREFIX*" --no-walk | head -1)
+if [ -z "$LAST_RELEASE" ]; then
+    echo "No release found for branch $BRANCH"
+else
+    git checkout --detach "$LAST_RELEASE"
+fi
 
 echo
 echo "Will build: -----------------------------------------"

ci/requirements.txt

@@ -1 +1,2 @@
 c2cciutils[checks,publish]==1.5.0
+pre-commit==2.21.0

runtime/usr/local/bin/mapserv_wrapper

@@ -1,10 +1,11 @@
-#!/bin/bash
+#!/bin/bash -ax
 
 # Add the environment variables that were set when apache was started
+# shellcheck source=/dev/null
 source /tmp/init_env
 
 # GDAL uses CWD to write temporary files. So we better be in a location writable by www-data.
-cd /tmp
+cd /tmp || exit 1
 
 if [[ "${MAPSERVER_CATCH_SEGV}" == 1 ]]; then
     exec catchsegv /usr/local/bin/mapserv "$@"

runtime/usr/local/bin/start-server

@@ -16,6 +16,6 @@ fi
 
 trap '' WINCH
 
-rm -f $APACHE_RUN_DIR/apache2.pid
+rm -f "$APACHE_RUN_DIR/apache2.pid"
 
 exec apache2 -DFOREGROUND