Merge branch 'master' into article/qgis-4-futur

Author: Guts

.devcontainer/devcontainer.json

@@ -2,11 +2,11 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
     "name": "Édition en ligne",
-    // "build": {
-    //     "dockerfile": "Dockerfile"
-    // },
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
     // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-    "image": "mcr.microsoft.com/devcontainers/python:0-3.11",
+    // "image": "mcr.microsoft.com/devcontainers/python:0-3.11",
     // Features to add to the dev container. More info: https://containers.dev/features.
     "features": {
         "ghcr.io/devcontainers-contrib/features/apt-packages:1": {
@@ -19,7 +19,8 @@
                 "libz-dev",
                 "pngquant"
             ]
-        }
+        },
+        "ghcr.io/devcontainers-contrib/features/coverage-py:2": {}
     },
     // Configure tool-specific properties.
     "customizations": {
@@ -36,7 +37,7 @@
                 },
                 "editor.formatOnSave": true,
                 "editor.codeActionsOnSave": {
-                    "source.organizeImports": true
+                    "source.organizeImports": "explicit"
                 },
                 // Markdown
                 "markdown.updateLinksOnFileMove.enabled": "prompt",
@@ -45,21 +46,21 @@
                 "markdown.validate.fileLinks.markdownFragmentLinks": "warning",
                 "markdown.validate.fragmentLinks.enabled": "warning",
                 "[markdown]": {
-                    "files.trimTrailingWhitespace": false,
+                    "files.trimTrailingWhitespace": false
                 },
                 // Python
                 "python.defaultInterpreterPath": ".venv/bin/python",
                 "[python]": {
                     "editor.codeActionsOnSave": {
-                        "source.organizeImports": true
+                        "source.organizeImports": "explicit"
                     },
                     "editor.defaultFormatter": "ms-python.black-formatter",
                     "editor.formatOnSave": true,
                     "editor.guides.bracketPairs": "active",
                     "editor.rulers": [
                         88
                     ],
-                    "editor.wordWrapColumn": 88,
+                    "editor.wordWrapColumn": 88
                 },
                 // extensions
                 "autoDocstring.guessTypes": true,
@@ -69,7 +70,7 @@
                 "yaml.schemas": {
                     "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs*.yml",
                     "https://json.schemastore.org/github-workflow.json": ".github/workflows/*.yml",
-                    "https://json.schemastore.org/markdownlint.json": ".markdownlint*",
+                    "https://json.schemastore.org/markdownlint.json": ".markdownlint*"
                 },
                 "yaml.customTags": [
                     "!ENV scalar",

.github/ISSUE_TEMPLATE/RDP_NEWS.yml

@@ -5,6 +5,7 @@ assignees:
   - aurelienchaumet
   - guts
   - igeofr
+  - gounux
 
 body:
   - type: markdown

.github/workflows/deploy.yml

@@ -65,7 +65,6 @@ jobs:
       - name: Build static website
         run: |
           geotribu --help > content/toc_nav_ignored/snippets/code/geotribu_cli_help.txt
-          python scripts/050_mkdocs_populate_latest.py -c mkdocs.yml
           python scripts/100_mkdocs_config_merger.py -c mkdocs.yml
           mkdocs build --clean --config-file mkdocs.yml --verbose --strict
         env:

.github/workflows/links_checker.yml

@@ -35,7 +35,6 @@ jobs:
 
       - name: Build static website
         run: |
-          python scripts/050_mkdocs_populate_latest.py
           python scripts/100_mkdocs_config_merger.py -c mkdocs.yml
           mkdocs build --clean --config-file mkdocs.yml --quiet --strict
         env:

.github/workflows/manual_new_rdp.yml

@@ -68,10 +68,9 @@ jobs:
 
       - name: Notification Slack
         id: slack
-        uses: slackapi/slack-github-action@v1.27
+        uses: slackapi/slack-github-action@v2.0
         if: "${{ github.event.inputs.notify-slack == 'true' }}"
         with:
+          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
           payload: '{"blocks":[{"type":"section","text":{"type":"mrkdwn","text":":newspaper: La GeoRDP du ${{ env.DATE_FR_LONG }} a été créée et attend vos contributions :writing_hand: !"}},{"type":"section","fields":[{"type":"mrkdwn","text":"Créée par *${{ github.actor }}* via GitHub Action."}]},{"type":"actions","elements":[{"type":"button","text":{"type":"plain_text","emoji":true,"text":":squid: Voir la PR (GitHub)"},"url":"${{ steps.cpr.outputs.pr_url }}"},{"type":"button","text":{"type":"plain_text","emoji":true,"text":":eye: Voir la preview (Netlify)"},"style":"primary","url":"https://preview-pullrequest-${{steps.cpr.outputs.pr_number}}--geotribu-preprod.netlify.app/"}]}]}'
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

.github/workflows/pr_checker_build.yml

@@ -77,7 +77,6 @@ jobs:
           export MKDOCS_SITE_URL="https://${NETLIFY_SITE_PREFIX}--${NETLIFY_SITE_NAME}.netlify.app/"
 
           # merge different configs
-          python scripts/050_mkdocs_populate_latest.py -c ${{ env.MKDOCS_CONFIG_FILENAME }}
           python scripts/100_mkdocs_config_merger.py -c ${{ env.MKDOCS_CONFIG_FILENAME }}
 
           # build

.github/workflows/pr_linter_markdown.yml

@@ -26,7 +26,7 @@ jobs:
       # Filter results by added/modified lines.
       - name: "Vérifie la syntaxe des lignes ajoutées ou modifiées"
         id: markdownlint-github-pr-review-added
-        uses: reviewdog/action-markdownlint@v0.25.0
+        uses: reviewdog/action-markdownlint@v0.26.0
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           fail_on_error: true
@@ -61,7 +61,7 @@ jobs:
       # # as long as they are in added/modified file even if the results are not in actual diff.
       # - name: "Vérifie la syntaxe de tous les fichiers ajoutés ou modifiés"
       #   id: markdownlint-github-pr-review-file
-      #   uses: reviewdog/action-markdownlint@v0.25.0
+      #   uses: reviewdog/action-markdownlint@v0.26.0
       #   with:
       #     github_token: ${{ secrets.GITHUB_TOKEN }}
       #     fail_on_error: false

.github/workflows/pr_preview_netlify.yml

@@ -25,7 +25,7 @@ jobs:
       # =============================== #
 
       - name: Download artifact from build workflow
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v7
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: pr-build-website

.gitignore

@@ -233,3 +233,4 @@ linkchecker_report.html
 # fichiers liés aux vidéos Gource
 gource.ini
 avatars/
+mkdocs-generated-configuration.yml

.mailmap

@@ -117,6 +117,7 @@ Robin Bourianes <[email protected]>
 Robin Bourianes <[email protected]> <[email protected]>
 
 Romain Lacroix <[email protected]>
+Romain Lacroix <[email protected]> <[email protected]>
 
 Samuel Deschamps-Berger <[email protected]>
 Samuel Deschamps-Berger <[email protected]> <[email protected]>