From d4100a73b7ad770c7d07dd1d0ba28662fb9d6351 Mon Sep 17 00:00:00 2001 From: gounux Date: Mon, 20 May 2024 09:51:24 +0200 Subject: [PATCH 01/11] Clean 2022-2024 yaml headers --- .../2022-01-11_quantifier_inegalites_traitement_meteo.md | 2 +- .../2022/2022-01-14_etude_impacts_loi_3ds_voirie.md | 1 + content/articles/2022/2022-05-24_releve_terrain_qfield.md | 2 +- content/articles/2022/2022-05-31_donnees_mapillary.md | 2 +- .../articles/2022/2022-09-30_carte_facon_ed_fairburn.md | 7 ++++--- content/articles/2022/2022-12-09_mapillary_experience.md | 2 +- .../2023/2023-01-28_retour-vers-le-futur-du-30dmc.md | 2 +- ...nce-qgis-fr-2023-profil-qdt-qgis-deployment-toolbelt.md | 2 +- ...s-cartes-avec-openstreetmap-python-pandas-matplotlib.md | 2 +- .../2024/2024-02-06_mise_en_place_serveur_qfieldcloud.md | 2 +- .../2024/2024-03-18_crowdscourcing_avec_cocarto.md | 2 +- 11 files changed, 14 insertions(+), 12 deletions(-) diff --git a/content/articles/2022/2022-01-11_quantifier_inegalites_traitement_meteo.md b/content/articles/2022/2022-01-11_quantifier_inegalites_traitement_meteo.md index 0bfea1230c..9114173712 100644 --- a/content/articles/2022/2022-01-11_quantifier_inegalites_traitement_meteo.md +++ b/content/articles/2022/2022-01-11_quantifier_inegalites_traitement_meteo.md @@ -12,8 +12,8 @@ license: default robots: index, follow tags: - météo - - télévision - R + - télévision --- # Comment j'ai quantifié les inégalités de traitement météorologiques entre Brest et Dijon diff --git a/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md b/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md index 47f9544124..18e2acf126 100644 --- a/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md +++ b/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md @@ -8,6 +8,7 @@ comments: true date: 2022-01-14 description: Etude d'impacts du déclassement de la voirie nationale aux Départements dans le cadre de la loi 3DS ; loi relative à la Différenciation, la Décentralisation, la Déconcentration et portant diverses mesures de Simplification de l'action publique locale. image: https://cdn.geotribu.fr/img/articles-blog-rdp/articles/etude_impacts_loi_3ds_voirie/etude_impacts_loi_3ds_voirie-logo.png +license: default tags: - loi 3DS - PostGIS diff --git a/content/articles/2022/2022-05-24_releve_terrain_qfield.md b/content/articles/2022/2022-05-24_releve_terrain_qfield.md index 3acf43af60..6dd67fdd31 100644 --- a/content/articles/2022/2022-05-24_releve_terrain_qfield.md +++ b/content/articles/2022/2022-05-24_releve_terrain_qfield.md @@ -11,9 +11,9 @@ image: https://cdn.geotribu.fr/img/articles-blog-rdp/articles/qgis_qfield_synchr license: cc4_by-sa tags: - collecte + - Lizmap - QField - QGIS - - Lizmap --- # Relevé terrain avec QField et solutions de synchronisation (hors QField Cloud) diff --git a/content/articles/2022/2022-05-31_donnees_mapillary.md b/content/articles/2022/2022-05-31_donnees_mapillary.md index cdefd69d46..9dddc09abc 100644 --- a/content/articles/2022/2022-05-31_donnees_mapillary.md +++ b/content/articles/2022/2022-05-31_donnees_mapillary.md @@ -14,9 +14,9 @@ tags: - Bash - cURL - data - - OGR - Mapillary - MVT + - OGR - PostGIS - PostgreSQL - tuiles vectorielles diff --git a/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md b/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md index bc848dad75..b18b8315e5 100644 --- a/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md +++ b/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md @@ -8,12 +8,13 @@ comments: true date: 2022-09-30 description: Utiliser les modes de fusion pour produire avec QGIS une carte inspirée des dessins d'Ed Fairburn. image: https://cdn.geotribu.fr/img/articles-blog-rdp/articles/carte_facon_ed_fairburn/carte_facon_ed_fairburn.png +license: default tags: - - QGIS - carte - - rendu - - mode de fusion - composeur d'impression + - mode de fusion + - QGIS + - rendu --- # Faire une carte façon Ed Fairburn avec QGIS diff --git a/content/articles/2022/2022-12-09_mapillary_experience.md b/content/articles/2022/2022-12-09_mapillary_experience.md index d2acaa0740..b05684b587 100644 --- a/content/articles/2022/2022-12-09_mapillary_experience.md +++ b/content/articles/2022/2022-12-09_mapillary_experience.md @@ -13,8 +13,8 @@ license: default tags: - Bash - data - - OGR - Mapillary + - OGR - SQL --- diff --git a/content/articles/2023/2023-01-28_retour-vers-le-futur-du-30dmc.md b/content/articles/2023/2023-01-28_retour-vers-le-futur-du-30dmc.md index 966e1e8b21..0378ab205e 100644 --- a/content/articles/2023/2023-01-28_retour-vers-le-futur-du-30dmc.md +++ b/content/articles/2023/2023-01-28_retour-vers-le-futur-du-30dmc.md @@ -14,8 +14,8 @@ image: https://cdn.geotribu.fr/img/articles-blog-rdp/articles/2023/retrospective license: beerware tags: - 30DayMapChallenge - - QGIS - OpenSource + - QGIS --- # Retour vers le futur du #30DayMapChallenge 2022 diff --git a/content/articles/2023/2023-03-12_conference-qgis-fr-2023-profil-qdt-qgis-deployment-toolbelt.md b/content/articles/2023/2023-03-12_conference-qgis-fr-2023-profil-qdt-qgis-deployment-toolbelt.md index 1f1547af76..278d6c6f32 100644 --- a/content/articles/2023/2023-03-12_conference-qgis-fr-2023-profil-qdt-qgis-deployment-toolbelt.md +++ b/content/articles/2023/2023-03-12_conference-qgis-fr-2023-profil-qdt-qgis-deployment-toolbelt.md @@ -14,8 +14,8 @@ robots: index, follow tags: - OSGeo-fr - QDT - - QGIS Deployment Toolbelt - QGIS + - QGIS Deployment Toolbelt --- # La conférence QGIS FR approche : préparez votre environnement avec QDT ! diff --git a/content/articles/2023/2023-12-05_prettymaps-jolies-cartes-avec-openstreetmap-python-pandas-matplotlib.md b/content/articles/2023/2023-12-05_prettymaps-jolies-cartes-avec-openstreetmap-python-pandas-matplotlib.md index 8e709bbe47..5d8d6a4052 100644 --- a/content/articles/2023/2023-12-05_prettymaps-jolies-cartes-avec-openstreetmap-python-pandas-matplotlib.md +++ b/content/articles/2023/2023-12-05_prettymaps-jolies-cartes-avec-openstreetmap-python-pandas-matplotlib.md @@ -15,8 +15,8 @@ license: beerware robots: index, follow tags: - cartographie - - OpenStreetMap - Matplotlib + - OpenStreetMap - prettymapp - prettymaps - Python diff --git a/content/articles/2024/2024-02-06_mise_en_place_serveur_qfieldcloud.md b/content/articles/2024/2024-02-06_mise_en_place_serveur_qfieldcloud.md index 1c04a1ffea..2b8b92b20d 100644 --- a/content/articles/2024/2024-02-06_mise_en_place_serveur_qfieldcloud.md +++ b/content/articles/2024/2024-02-06_mise_en_place_serveur_qfieldcloud.md @@ -16,9 +16,9 @@ tags: - déploiement - Docker - infra + - Q-ops - QField - QFieldCloud - - Q-ops --- # Déploiement et configuration d'un serveur QFieldCloud diff --git a/content/articles/2024/2024-03-18_crowdscourcing_avec_cocarto.md b/content/articles/2024/2024-03-18_crowdscourcing_avec_cocarto.md index 5547884465..4568e0999c 100644 --- a/content/articles/2024/2024-03-18_crowdscourcing_avec_cocarto.md +++ b/content/articles/2024/2024-03-18_crowdscourcing_avec_cocarto.md @@ -14,9 +14,9 @@ license: default robots: index, follow tags: - cocarto - - contribution - collecte - collecte terrain + - contribution - smartphone --- From 58da5dd7216e53cf39d989608a34c185cd3f0665 Mon Sep 17 00:00:00 2001 From: gounux Date: Sat, 22 Jun 2024 10:08:12 +0200 Subject: [PATCH 02/11] Add CI header check job --- .github/workflows/pr_header_check.yml | 30 +++++++++++++++++++++++++++ requirements.txt | 2 +- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/pr_header_check.yml diff --git a/.github/workflows/pr_header_check.yml b/.github/workflows/pr_header_check.yml new file mode 100644 index 0000000000..7f21cc6e21 --- /dev/null +++ b/.github/workflows/pr_header_check.yml @@ -0,0 +1,30 @@ +name: "✅ Markdown header check" + +on: + pull_request: + types: [ labeled ] + +jobs: + header-check: + name: "👓 Vérification du header markdown de l'article" + runs-on: ubuntu-latest + if: ${{ github.event.label.name == 'articles' }} + + steps: + - name: "Récupère le code source" + uses: actions/checkout@v4 + + - name: "Set up Python" + uses: actions/setup-python@v5 + with: + cache: "pip" + python-version: 3.11 + + - name: "Installer dépendances" + run: | + python -m pip install -U pip setuptools wheel + python -m pip install -U -r requirements.txt + + - name: "Vérifie les entêtes markdown avec le CLI" + run: | + geotribu header-check content/articles/2024/*.md --authors-folder content/team -minw 250 -maxw 1000 -v diff --git a/requirements.txt b/requirements.txt index 4cb501013b..dd4faee562 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # Development # ----------------------- -geotribu>=0.32,<1 +geotribu>=0.33,<1 pre-commit>=3,<4 # Project requirements From 7d1fa03f5c535b71bed7faffef082bf5d1666f82 Mon Sep 17 00:00:00 2001 From: gounux Date: Sat, 22 Jun 2024 10:23:42 +0200 Subject: [PATCH 03/11] Update required geotribu cli version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index dd4faee562..df24657dca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # Development # ----------------------- -geotribu>=0.33,<1 +geotribu>=0.34,<1 pre-commit>=3,<4 # Project requirements From 39248c9bed8ad6e3d4c5f4e86b33deabac0dadce Mon Sep 17 00:00:00 2001 From: gounux Date: Sun, 23 Jun 2024 08:27:17 +0200 Subject: [PATCH 04/11] add path condition --- .github/workflows/pr_header_check.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr_header_check.yml b/.github/workflows/pr_header_check.yml index 7f21cc6e21..76426571a2 100644 --- a/.github/workflows/pr_header_check.yml +++ b/.github/workflows/pr_header_check.yml @@ -2,7 +2,9 @@ name: "✅ Markdown header check" on: pull_request: - types: [ labeled ] + types: [labeled] + paths: + - "content/articles/**/*.md" jobs: header-check: From 738459023f84908c2527907a8034e3cb9cec2cdc Mon Sep 17 00:00:00 2001 From: gounux Date: Sun, 23 Jun 2024 08:34:35 +0200 Subject: [PATCH 05/11] change if condition --- .github/workflows/pr_header_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_header_check.yml b/.github/workflows/pr_header_check.yml index 76426571a2..75bcabef82 100644 --- a/.github/workflows/pr_header_check.yml +++ b/.github/workflows/pr_header_check.yml @@ -10,7 +10,7 @@ jobs: header-check: name: "👓 Vérification du header markdown de l'article" runs-on: ubuntu-latest - if: ${{ github.event.label.name == 'articles' }} + if: contains(github.event.pull_request.labels.*.name, 'articles') steps: - name: "Récupère le code source" From a3ea4ef3da6be38ebc3d4246e08ae995bc3c8cb1 Mon Sep 17 00:00:00 2001 From: gounux Date: Sun, 23 Jun 2024 10:03:40 +0200 Subject: [PATCH 06/11] Remove license header keywords --- content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md | 1 - content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md | 1 - 2 files changed, 2 deletions(-) diff --git a/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md b/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md index 18e2acf126..47f9544124 100644 --- a/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md +++ b/content/articles/2022/2022-01-14_etude_impacts_loi_3ds_voirie.md @@ -8,7 +8,6 @@ comments: true date: 2022-01-14 description: Etude d'impacts du déclassement de la voirie nationale aux Départements dans le cadre de la loi 3DS ; loi relative à la Différenciation, la Décentralisation, la Déconcentration et portant diverses mesures de Simplification de l'action publique locale. image: https://cdn.geotribu.fr/img/articles-blog-rdp/articles/etude_impacts_loi_3ds_voirie/etude_impacts_loi_3ds_voirie-logo.png -license: default tags: - loi 3DS - PostGIS diff --git a/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md b/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md index b18b8315e5..7dea297161 100644 --- a/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md +++ b/content/articles/2022/2022-09-30_carte_facon_ed_fairburn.md @@ -8,7 +8,6 @@ comments: true date: 2022-09-30 description: Utiliser les modes de fusion pour produire avec QGIS une carte inspirée des dessins d'Ed Fairburn. image: https://cdn.geotribu.fr/img/articles-blog-rdp/articles/carte_facon_ed_fairburn/carte_facon_ed_fairburn.png -license: default tags: - carte - composeur d'impression From 037167204ba090892848f9b41fc37c5d24244e04 Mon Sep 17 00:00:00 2001 From: gounux Date: Wed, 3 Jul 2024 14:17:38 +0200 Subject: [PATCH 07/11] update geotribu_cli in requirements --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index df24657dca..943f012e01 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # Development # ----------------------- -geotribu>=0.34,<1 +geotribu>=0.34.1,<1 pre-commit>=3,<4 # Project requirements From 64766a7996d18868dca4e38f5970e89fa70ac695 Mon Sep 17 00:00:00 2001 From: gounux Date: Wed, 3 Jul 2024 14:19:29 +0200 Subject: [PATCH 08/11] edit header check workflow --- .github/workflows/pr_header_check.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr_header_check.yml b/.github/workflows/pr_header_check.yml index 75bcabef82..7bdd995739 100644 --- a/.github/workflows/pr_header_check.yml +++ b/.github/workflows/pr_header_check.yml @@ -2,7 +2,6 @@ name: "✅ Markdown header check" on: pull_request: - types: [labeled] paths: - "content/articles/**/*.md" @@ -13,7 +12,7 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'articles') steps: - - name: "Récupère le code source" + - name: "Fetch source code" uses: actions/checkout@v4 - name: "Set up Python" @@ -22,11 +21,11 @@ jobs: cache: "pip" python-version: 3.11 - - name: "Installer dépendances" + - name: "Install requirements" run: | python -m pip install -U pip setuptools wheel python -m pip install -U -r requirements.txt - - name: "Vérifie les entêtes markdown avec le CLI" + - name: "Check markdown headers using CLI" run: | - geotribu header-check content/articles/2024/*.md --authors-folder content/team -minw 250 -maxw 1000 -v + geotribu header-check content/articles/2024/*.md --authors-folder content/team -maxw 1000 -v From 93fb48aeb98b987bd6af0d04aeb75341de3ee040 Mon Sep 17 00:00:00 2001 From: gounux Date: Wed, 3 Jul 2024 18:05:46 +0200 Subject: [PATCH 09/11] edit checked articles pattern --- .github/workflows/pr_header_check.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr_header_check.yml b/.github/workflows/pr_header_check.yml index 7bdd995739..c372f33522 100644 --- a/.github/workflows/pr_header_check.yml +++ b/.github/workflows/pr_header_check.yml @@ -28,4 +28,4 @@ jobs: - name: "Check markdown headers using CLI" run: | - geotribu header-check content/articles/2024/*.md --authors-folder content/team -maxw 1000 -v + geotribu header-check content/articles/202*/*.md --authors-folder content/team -maxw 1000 -v From 1d1c48d68cc5605a90f405173dc35a22d913b31e Mon Sep 17 00:00:00 2001 From: gounux Date: Sun, 7 Jul 2024 11:13:55 +0200 Subject: [PATCH 10/11] update geotribu cli min version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 943f012e01..2e55e390f2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ # Development # ----------------------- -geotribu>=0.34.1,<1 +geotribu>=0.34.3,<1 pre-commit>=3,<4 # Project requirements From 8bde8b134003f748bbdd54d833e765a2df347490 Mon Sep 17 00:00:00 2001 From: gounux Date: Sun, 7 Jul 2024 11:19:59 +0200 Subject: [PATCH 11/11] =?UTF-8?q?modif=20tags=20ordre=20alphab=C3=A9tique?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/articles/2024/2024-06-24_lidar_hd_avec_pdal.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/articles/2024/2024-06-24_lidar_hd_avec_pdal.md b/content/articles/2024/2024-06-24_lidar_hd_avec_pdal.md index 54e2cebc0c..e53858e321 100644 --- a/content/articles/2024/2024-06-24_lidar_hd_avec_pdal.md +++ b/content/articles/2024/2024-06-24_lidar_hd_avec_pdal.md @@ -14,9 +14,9 @@ license: beerware robots: index, follow tags: - IGN + - LiDAR - OGR - PDAL - - LiDAR --- # LiDAR HD brut - Distinguer sol et sursol avec pdal