Skip to content

Commit 664c4d2

Browse files
GutsGuts
authored
Merge branch 'master' into article/qgis-4-futur
2 parents d1b8f8e + 1ce9c74 commit 664c4d2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1604
-200
lines changed

‎.devcontainer/devcontainer.json

+11-10
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
// README at: https://github.com/devcontainers/templates/tree/main/src/python
33
{
44
"name": "Édition en ligne",
5-
// "build": {
6-
// "dockerfile": "Dockerfile"
7-
// },
5+
"build": {
6+
"dockerfile": "Dockerfile"
7+
},
88
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
9-
"image": "mcr.microsoft.com/devcontainers/python:0-3.11",
9+
// "image": "mcr.microsoft.com/devcontainers/python:0-3.11",
1010
// Features to add to the dev container. More info: https://containers.dev/features.
1111
"features": {
1212
"ghcr.io/devcontainers-contrib/features/apt-packages:1": {
@@ -19,7 +19,8 @@
1919
"libz-dev",
2020
"pngquant"
2121
]
22-
}
22+
},
23+
"ghcr.io/devcontainers-contrib/features/coverage-py:2": {}
2324
},
2425
// Configure tool-specific properties.
2526
"customizations": {
@@ -36,7 +37,7 @@
3637
},
3738
"editor.formatOnSave": true,
3839
"editor.codeActionsOnSave": {
39-
"source.organizeImports": true
40+
"source.organizeImports": "explicit"
4041
},
4142
// Markdown
4243
"markdown.updateLinksOnFileMove.enabled": "prompt",
@@ -45,21 +46,21 @@
4546
"markdown.validate.fileLinks.markdownFragmentLinks": "warning",
4647
"markdown.validate.fragmentLinks.enabled": "warning",
4748
"[markdown]": {
48-
"files.trimTrailingWhitespace": false,
49+
"files.trimTrailingWhitespace": false
4950
},
5051
// Python
5152
"python.defaultInterpreterPath": ".venv/bin/python",
5253
"[python]": {
5354
"editor.codeActionsOnSave": {
54-
"source.organizeImports": true
55+
"source.organizeImports": "explicit"
5556
},
5657
"editor.defaultFormatter": "ms-python.black-formatter",
5758
"editor.formatOnSave": true,
5859
"editor.guides.bracketPairs": "active",
5960
"editor.rulers": [
6061
88
6162
],
62-
"editor.wordWrapColumn": 88,
63+
"editor.wordWrapColumn": 88
6364
},
6465
// extensions
6566
"autoDocstring.guessTypes": true,
@@ -69,7 +70,7 @@
6970
"yaml.schemas": {
7071
"https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs*.yml",
7172
"https://json.schemastore.org/github-workflow.json": ".github/workflows/*.yml",
72-
"https://json.schemastore.org/markdownlint.json": ".markdownlint*",
73+
"https://json.schemastore.org/markdownlint.json": ".markdownlint*"
7374
},
7475
"yaml.customTags": [
7576
"!ENV scalar",

‎.github/ISSUE_TEMPLATE/RDP_NEWS.yml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ assignees:
55
- aurelienchaumet
66
- guts
77
- igeofr
8+
- gounux
89

910
body:
1011
- type: markdown

‎.github/workflows/deploy.yml

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ jobs:
6565
- name: Build static website
6666
run: |
6767
geotribu --help > content/toc_nav_ignored/snippets/code/geotribu_cli_help.txt
68-
python scripts/050_mkdocs_populate_latest.py -c mkdocs.yml
6968
python scripts/100_mkdocs_config_merger.py -c mkdocs.yml
7069
mkdocs build --clean --config-file mkdocs.yml --verbose --strict
7170
env:

‎.github/workflows/links_checker.yml

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ jobs:
3535
3636
- name: Build static website
3737
run: |
38-
python scripts/050_mkdocs_populate_latest.py
3938
python scripts/100_mkdocs_config_merger.py -c mkdocs.yml
4039
mkdocs build --clean --config-file mkdocs.yml --quiet --strict
4140
env:

‎.github/workflows/manual_new_rdp.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ jobs:
6868

6969
- name: Notification Slack
7070
id: slack
71-
uses: slackapi/slack-github-action@v1.27
71+
uses: slackapi/slack-github-action@v2.0
7272
if: "${{ github.event.inputs.notify-slack == 'true' }}"
7373
with:
74+
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
75+
webhook-type: incoming-webhook
7476
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/"}]}]}'
75-
env:
76-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
77-
SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK

‎.github/workflows/pr_checker_build.yml

-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ jobs:
7777
export MKDOCS_SITE_URL="https://${NETLIFY_SITE_PREFIX}--${NETLIFY_SITE_NAME}.netlify.app/"
7878
7979
# merge different configs
80-
python scripts/050_mkdocs_populate_latest.py -c ${{ env.MKDOCS_CONFIG_FILENAME }}
8180
python scripts/100_mkdocs_config_merger.py -c ${{ env.MKDOCS_CONFIG_FILENAME }}
8281
8382
# build

‎.github/workflows/pr_linter_markdown.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
# Filter results by added/modified lines.
2727
- name: "Vérifie la syntaxe des lignes ajoutées ou modifiées"
2828
id: markdownlint-github-pr-review-added
29-
uses: reviewdog/action-markdownlint@v0.25.0
29+
uses: reviewdog/action-markdownlint@v0.26.0
3030
with:
3131
github_token: ${{ secrets.GITHUB_TOKEN }}
3232
fail_on_error: true
@@ -61,7 +61,7 @@ jobs:
6161
# # as long as they are in added/modified file even if the results are not in actual diff.
6262
# - name: "Vérifie la syntaxe de tous les fichiers ajoutés ou modifiés"
6363
# id: markdownlint-github-pr-review-file
64-
# uses: reviewdog/action-markdownlint@v0.25.0
64+
# uses: reviewdog/action-markdownlint@v0.26.0
6565
# with:
6666
# github_token: ${{ secrets.GITHUB_TOKEN }}
6767
# fail_on_error: false

‎.github/workflows/pr_preview_netlify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
# =============================== #
2626

2727
- name: Download artifact from build workflow
28-
uses: dawidd6/action-download-artifact@v6
28+
uses: dawidd6/action-download-artifact@v7
2929
with:
3030
github_token: ${{ secrets.GITHUB_TOKEN }}
3131
name: pr-build-website

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -233,3 +233,4 @@ linkchecker_report.html
233233
# fichiers liés aux vidéos Gource
234234
gource.ini
235235
avatars/
236+
mkdocs-generated-configuration.yml

‎.mailmap

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ Robin Bourianes <robin.bourianes@kalisio.com>
117117
Robin Bourianes <robin.bourianes@kalisio.com> <robin.bourianes@gmail.com>
118118

119119
Romain Lacroix <romain.lacroix@free.fr>
120+
Romain Lacroix <romain.lacroix@free.fr> <rxlacroix@users.noreply.github.com>
120121

121122
Samuel Deschamps-Berger <samuel.deschampsberger@geovelo.fr>
122123
Samuel Deschamps-Berger <samuel.deschampsberger@geovelo.fr> <samDB-gv@users.noreply.github.com>

‎.pre-commit-config.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ repos:
66
- id: check-hooks-apply
77

88
- repo: https://github.com/pre-commit/pre-commit-hooks
9-
rev: v4.6.0
9+
rev: v5.0.0
1010
hooks:
1111
- id: check-added-large-files
1212
- id: check-case-conflict
@@ -21,21 +21,21 @@ repos:
2121
- --markdown-linebreak-ext=md
2222

2323
- repo: https://github.com/asottile/pyupgrade
24-
rev: v3.17.0
24+
rev: v3.19.0
2525
hooks:
2626
- id: pyupgrade
2727
args:
2828
- "--py39-plus"
2929

3030
- repo: https://github.com/astral-sh/ruff-pre-commit
31-
rev: "v0.6.3"
31+
rev: "v0.8.1"
3232
hooks:
3333
- id: ruff
3434
args:
3535
- --fix-only
3636

3737
- repo: https://github.com/psf/black
38-
rev: 24.8.0
38+
rev: 24.10.0
3939
hooks:
4040
- id: black
4141

@@ -57,7 +57,7 @@ repos:
5757
- --select=E9,F63,F7,F82
5858

5959
- repo: https://github.com/igorshubovych/markdownlint-cli
60-
rev: v0.41.0
60+
rev: v0.43.0
6161
hooks:
6262
- id: markdownlint
6363
args:

‎.vscode/settings.json

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"markdown.validate.fileLinks.markdownFragmentLinks": "warning",
1919
"markdown.validate.fragmentLinks.enabled": "warning",
2020
"[markdown]": {
21+
"editor.insertSpaces": true,
22+
"editor.tabSize": 4,
2123
"files.trimTrailingWhitespace": false,
2224
},
2325
// Python
@@ -29,9 +31,11 @@
2931
"editor.defaultFormatter": "ms-python.black-formatter",
3032
"editor.formatOnSave": true,
3133
"editor.guides.bracketPairs": "active",
34+
"editor.insertSpaces": true,
3235
"editor.rulers": [
3336
88
3437
],
38+
"editor.tabSize": 4,
3539
"editor.wordWrapColumn": 88,
3640
},
3741
"flake8.args": [

‎README.md

-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
[![🎳 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)
88
[![🤖 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)
99

10-
[![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)
11-
1210
[![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/)
1311

1412
Sources et contenus du site de Geotribu, accessible via les URLs suivantes :

‎config/extra_latest.yml

-5
This file was deleted.

‎content/articles/.pages

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
title: "&#128214; Articles"
22

33
nav:
4+
- "2025"
45
- "2024"
56
- "2023"
67
- "2022"

‎content/articles/2021/2021-02-19_ignfr2map_automatisation_deploiement.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,7 @@ Voici ce que ça donne :
247247

248248
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 :
249249

250-
![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 }
251-
{: align=middle }
250+
![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 }
252251

253252
----
254253

‎content/articles/2024/2024-02-16_de-twitter-a-mastodon-guide-geo-import-liste-comptes.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,11 @@ Enfin bref, vous avez compris l'idée quoi.
226226
227227
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.
228228
229-
![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 }
230-
231-
[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 }
229+
[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 }
232230
{: align=middle }
233231
232+
![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 }
233+
234234
----
235235
236236
## À bientôt sur Mastodon

‎content/articles/2024/2024-09-05_de-la-tolerance-en-sig-geometrie-08-algorithmes-code.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,7 @@ Vous devriez avoir cette sortie :
224224

225225
`Les nombres 0.30000000000000004 et 0.3 sont égaux avec une tolérance de 1e-09.`
226226

227-
Pour une étude plus approfondie, je vous encourage à lire l'article [Comparing Two Floating-Point Numbers
228-
](https://embeddeduse.com/2019/08/26/qt-compare-two-floats/).
227+
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/).
229228

230229
Comme vous avez pu le deviner, c'est ce que fait ArcGIS.
231230
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:

0 commit comments

Comments
 (0)