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

geotribu · Dec 31, 2024 · 664c4d2 · 664c4d2
2 parents d1b8f8e + 1ce9c74
commit 664c4d2
Show file tree

Hide file tree

Showing 51 changed files with 1,604 additions and 200 deletions.
diff --git a/.devcontainer/devcontainer.json b/.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",

diff --git a/.github/ISSUE_TEMPLATE/RDP_NEWS.yml b/.github/ISSUE_TEMPLATE/RDP_NEWS.yml
@@ -5,6 +5,7 @@ assignees:
   - aurelienchaumet
   - guts
   - igeofr
+  - gounux
 
 body:
   - type: markdown

diff --git a/.github/workflows/deploy.yml b/.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:

diff --git a/.github/workflows/links_checker.yml b/.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:

diff --git a/.github/workflows/manual_new_rdp.yml b/.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
diff --git a/.github/workflows/pr_checker_build.yml b/.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

diff --git a/.github/workflows/pr_linter_markdown.yml b/.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

diff --git a/.github/workflows/pr_preview_netlify.yml b/.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

diff --git a/.gitignore b/.gitignore
@@ -233,3 +233,4 @@ linkchecker_report.html
 # fichiers liés aux vidéos Gource
 gource.ini
 avatars/
+mkdocs-generated-configuration.yml
diff --git a/.mailmap b/.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]>

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@ repos:
       - id: check-hooks-apply
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-added-large-files
       - id: check-case-conflict
@@ -21,21 +21,21 @@ repos:
           - --markdown-linebreak-ext=md
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.17.0
+    rev: v3.19.0
     hooks:
       - id: pyupgrade
         args:
           - "--py39-plus"
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.6.3"
+    rev: "v0.8.1"
     hooks:
       - id: ruff
         args:
           - --fix-only
 
   - repo: https://github.com/psf/black
-    rev: 24.8.0
+    rev: 24.10.0
     hooks:
       - id: black
 
@@ -57,7 +57,7 @@ repos:
           - --select=E9,F63,F7,F82
 
   - repo: https://github.com/igorshubovych/markdownlint-cli
-    rev: v0.41.0
+    rev: v0.43.0
     hooks:
       - id: markdownlint
         args:

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -18,6 +18,8 @@
     "markdown.validate.fileLinks.markdownFragmentLinks": "warning",
     "markdown.validate.fragmentLinks.enabled": "warning",
     "[markdown]": {
+        "editor.insertSpaces": true,
+        "editor.tabSize": 4,
         "files.trimTrailingWhitespace": false,
     },
     // Python
@@ -29,9 +31,11 @@
         "editor.defaultFormatter": "ms-python.black-formatter",
         "editor.formatOnSave": true,
         "editor.guides.bracketPairs": "active",
+        "editor.insertSpaces": true,
         "editor.rulers": [
             88
         ],
+        "editor.tabSize": 4,
         "editor.wordWrapColumn": 88,
     },
     "flake8.args": [

diff --git a/README.md b/README.md
@@ -7,8 +7,6 @@
 [![🎳 Vérification des liens](https://github.com/geotribu/website/actions/workflows/links_checker.yml/badge.svg)](https://github.com/geotribu/website/actions/workflows/links_checker.yml)
 [![🤖 Réponse automatique à un ticket de proposition de contenu](https://github.com/geotribu/website/actions/workflows/issue_comment.yml/badge.svg)](https://github.com/geotribu/website/actions/workflows/issue_comment.yml)
 
-[![Ouvrir dans l'éditeur en ligne](https://img.shields.io/static/v1?logo=visualstudiocode&label=&message=Open%20in%20Visual%20Studio%20Code&labelColor=2c2c32&color=007acc&logoColor=007acc)](https://open.vscode.dev/geotribu/website)
-
 [![Built with Material for MkDocs](https://img.shields.io/badge/Material_for_MkDocs-526CFE?style=for-the-badge&logo=MaterialForMkDocs&logoColor=white)](https://squidfunk.github.io/mkdocs-material/)
 
 Sources et contenus du site de Geotribu, accessible via les URLs suivantes :

diff --git a/config/extra_latest.yml b/config/extra_latest.yml
diff --git a/content/articles/.pages b/content/articles/.pages
@@ -1,6 +1,7 @@
 title: "&#128214; Articles"
 
 nav:
+    - "2025"
     - "2024"
     - "2023"
     - "2022"

diff --git a/content/articles/2021/2021-02-19_ignfr2map_automatisation_deploiement.md b/content/articles/2021/2021-02-19_ignfr2map_automatisation_deploiement.md
@@ -247,8 +247,7 @@ Voici ce que ça donne :
 
 Ce travail semble long mais c'est surtout que j'ai tenu à le détailler car en réalité, l'exécution complète de toute la chaîne de valeur prend moins d'une minute :
 
-![Github workflow result](https://cdn.geotribu.fr/img/articles-blog-rdp/articles/ign_opendata_map/github_action_workflow_result.png "Résultat de l'exécution déclenchée manuellement : 40 secondes"){: loading=lazy }
-{: align=middle }
+![Github workflow result](https://cdn.geotribu.fr/img/articles-blog-rdp/articles/ign_opendata_map/github_action_workflow_result.png "Résultat de l'exécution déclenchée manuellement : 40 secondes"){: .img-center loading=lazy }
 
 ----
 

diff --git a/...rticles/2024/2024-02-16_de-twitter-a-mastodon-guide-geo-import-liste-comptes.md b/...rticles/2024/2024-02-16_de-twitter-a-mastodon-guide-geo-import-liste-comptes.md
@@ -226,11 +226,11 @@ Enfin bref, vous avez compris l'idée quoi.
 
 Enfin, si vous pensez l'utiliser, sachez que [Mapstodon] a été créé par l'ami [Jérémy](https://mapper.fr/) et qu'à ce titre c'est son compte en banque qui est débité à chaque message posté, requête envoyée, etc. Si vous en avez les moyens, donnez donc 1€/mois pour contribuer à la viabilité de cet espace qui ne se finance ni tout seul, ni en revendant nos données personnelles ou de l'espace publicitaire.
 
-![Page Patreon pour l'instance Mapstodon](https://cdn.geotribu.fr/img/articles-blog-rdp/articles/2024/transition_mastodon/mapstodon_patreon.webp){: .img-center loading=lazy }
-
-[Aider à financer Mapstodon :fontawesome-solid-hand-holding-heart:](https://patreon.com/mapstodon?utm_medium=ref_geotribu&utm_source=copyLink&utm_campaign=geotribu_article&utm_content=join_link){: .md-button }
+[Aider financièrement à viabiliser Mapstodon :fontawesome-solid-hand-holding-heart:](https://fr.liberapay.com/mapper/?utm_medium=ref_geotribu&utm_source=copyLink&utm_campaign=geotribu_article&utm_content=join_link){: .md-button }
 {: align=middle }
 
+![Page Liberapay pour l'instance Mapstodon](https://cdn.geotribu.fr/img/articles-blog-rdp/articles/2024/transition_mastodon/mapstodon_liberapay.webp){: .img-center loading=lazy }
+
 ----
 
 ## À bientôt sur Mastodon

diff --git a/...rticles/2024/2024-09-05_de-la-tolerance-en-sig-geometrie-08-algorithmes-code.md b/...rticles/2024/2024-09-05_de-la-tolerance-en-sig-geometrie-08-algorithmes-code.md
@@ -224,8 +224,7 @@ Vous devriez avoir cette sortie :
 
 `Les nombres 0.30000000000000004 et 0.3 sont égaux avec une tolérance de 1e-09.`
 
-Pour une étude plus approfondie, je vous encourage à lire l'article [Comparing Two Floating-Point Numbers
-](https://embeddeduse.com/2019/08/26/qt-compare-two-floats/).
+Pour une étude plus approfondie, je vous encourage à lire l'article [Comparing Two Floating-Point Numbers](https://embeddeduse.com/2019/08/26/qt-compare-two-floats/).
 
 Comme vous avez pu le deviner, c'est ce que fait ArcGIS.
 Dans plusieurs endroits de nos SIG, il existe des comparaisons floues, peut-être que les prochaines versions de GEOS intègreront cette tolérance pour les relations. :wink:
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ assignees: @@
       - aurelienchaumet
       - guts
       - igeofr
+      - gounux
     body:
       - type: markdown
@@ Expand Down @@