update(chore): adapte la config et l'outillage maintenant que la version gratuite est équivalente (#1364)

See:
https://squidfunk.github.io/mkdocs-material/blog/2025/11/11/insiders-now-free-for-everyone/

Author: Guts

.github/labeler.yml

@@ -1,81 +1,80 @@
 articles:
-    - changed-files:
-          - any-glob-to-any-file:
-                - content/articles/**/*.md
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/articles/**/*.md
 
 contenus communs:
-    - changed-files:
-          - any-glob-to-any-file:
-                - content/*.md
-                - content/newsletter/*.md
-                - content/toc_nav_ignored/**
-    - head-branch:
-          - common
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/*.md
+          - content/newsletter/*.md
+          - content/toc_nav_ignored/**
+  - head-branch:
+      - common
 
 contributeurices:
-    - changed-files:
-          - any-glob-to-any-file:
-                - content/team/**/*.md
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/team/**/*.md
 
 dependencies:
-    - changed-files:
-          - any-glob-to-any-file:
-                - requirements/*.txt
-                - requirements.txt
+  - changed-files:
+      - any-glob-to-any-file:
+          - requirements/*.txt
+          - requirements.txt
 
 enhancement:
-    - head-branch:
-          - ^feature
-          - feature
-          - ^improve
-          - improve
+  - head-branch:
+      - ^feature
+      - feature
+      - ^improve
+      - improve
 
 mkdocs:
-    - changed-files:
-          - any-glob-to-any-file:
-                - config/**
-                - content/**/*.pages
-                - hooks/**
-                - mkdocs*.yml
+  - changed-files:
+      - any-glob-to-any-file:
+          - config/**
+          - content/**/*.pages
+          - hooks/**
+          - mkdocs*.yml
 
 rdp:
-    - changed-files:
-          - any-glob-to-any-file:
-                - content/rdp/**/*.md
-    - head-branch:
-          - ^rdp
-          - rdp
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/rdp/**/*.md
+  - head-branch:
+      - ^rdp
+      - rdp
 
 thème:
-    - changed-files:
-          - any-glob-to-any-file:
-                - content/theme/**/*
-                - requirements-insiders.txt
-    - head-branch:
-          - theme
-          - ^theme
+  - changed-files:
+      - any-glob-to-any-file:
+          - content/theme/**/*
+  - head-branch:
+      - theme
+      - ^theme
 
 tipex:
-    - head-branch:
-          - tipex
-          - ^tipex
+  - head-branch:
+      - tipex
+      - ^tipex
 
 outillage:
-    - changed-files:
-          - any-glob-to-any-file:
-                - .devcontainer/**
-                - .github/**
-                - .pre-commit-config.yaml
-                - .vscode/**/*
-                - .docker
-                - .lincheckrrc
-                - .mailmap
-                - .markdownlint*
-                - docker*
-                - Dockerfile
-                - scripts/**
-    - head-branch:
-          - ^ci
-          - ci
-          - ^tooling
-          - tooling
+  - changed-files:
+      - any-glob-to-any-file:
+          - .devcontainer/**
+          - .github/**
+          - .pre-commit-config.yaml
+          - .vscode/**/*
+          - .docker
+          - .lincheckrrc
+          - .mailmap
+          - .markdownlint*
+          - docker*
+          - Dockerfile
+          - scripts/**
+  - head-branch:
+      - ^ci
+      - ci
+      - ^tooling
+      - tooling

.github/workflows/deploy.yml

@@ -50,11 +50,9 @@ jobs:
           cache: "pip"
 
       - name: Install dependencies
-        env:
-          GH_TOKEN_MATERIAL_INSIDERS: ${{ secrets.GH_TOKEN_MATERIAL_INSIDERS }}
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade -r requirements-insiders.txt
+          python -m pip install --upgrade -r requirements.txt
 
       - name: Cache build dependencies (external assets downloaded)
         uses: actions/cache@v4

.github/workflows/links_checker.yml

@@ -31,11 +31,9 @@ jobs:
           cache: "pip"
 
       - name: Install dependencies
-        env:
-          GH_TOKEN_MATERIAL_INSIDERS: ${{ secrets.GH_TOKEN_MATERIAL_INSIDERS }}
         run: |
           python -m pip install --upgrade pip setuptools wheel
-          python -m pip install --upgrade -r requirements-insiders.txt
+          python -m pip install --upgrade -r requirements.txt
           python -m pip install --upgrade "LinkChecker>=10,<11"
 
       - name: Build static website

.github/workflows/pr_checker_build.yml

@@ -41,21 +41,9 @@ jobs:
 
       - name: Install dependencies
         id: dependencies
-        env:
-          GH_TOKEN_MATERIAL_INSIDERS: ${{ secrets.GH_TOKEN_MATERIAL_INSIDERS }}
         run: |
           python -m pip install -U pip setuptools wheel
-
-          # if secret (PR created by repo collaborator) exists = paid features, else only free
-          if [[ -z "${GH_TOKEN_MATERIAL_INSIDERS}" ]]; then
-            echo "::warning:: L'accès aux token est réservé aux comptes avec droits d'écriture sur le dépôt. La version gratuite du thème est donc utilisée sans mots-clés, etc.)"
-            python -m pip install -U -r requirements-free.txt
-            echo "MKDOCS_CONFIG_FILENAME=mkdocs-free.yml" >> $GITHUB_ENV
-          else
-            # install insiders version using token
-            python -m pip install -U -r requirements-insiders.txt
-            echo "MKDOCS_CONFIG_FILENAME=mkdocs.yml" >> $GITHUB_ENV
-          fi
+          python -m pip install -U -r requirements.txt
 
       - name: Cache build dependencies (external assets downloaded)
         uses: actions/cache@v4
@@ -77,13 +65,13 @@ jobs:
           export MKDOCS_SITE_URL="https://${NETLIFY_SITE_PREFIX}--${NETLIFY_SITE_NAME}.netlify.app/"
 
           # merge different configs
-          python scripts/100_mkdocs_config_merger.py -c ${{ env.MKDOCS_CONFIG_FILENAME }}
+          python scripts/100_mkdocs_config_merger.py
 
           # build
-          mkdocs build --config-file ${{ env.MKDOCS_CONFIG_FILENAME }} --strict
+          mkdocs build --strict
 
           # save mkdocs.yml for debug
-          cp ${{ env.MKDOCS_CONFIG_FILENAME }} ${{ env.BUILD_DIR }}
+          cp mkdocs.yml ${{ env.BUILD_DIR }}
 
           # remove files reserved for production
           rm ${{ env.BUILD_DIR }}/CNAME

README.md

@@ -24,7 +24,7 @@ Sources et contenus du site de Geotribu, accessible via les URLs suivantes :
 
 ### Prérequis
 
-- Python >= 3.9
+- Python >= 3.12
 
 #### Recommandés
 
@@ -39,19 +39,8 @@ python -m pip install -U pip
 python -m pip install -U setuptools wheel
 ```
 
-### Version gratuite
-
 ```bash
-python -m pip install -U -r requirements-free.txt
-```
-
-#### Version Insiders
-
-Pour utiliser la [version Insiders du thème Material for Mkdocs](https://squidfunk.github.io/mkdocs-material/insiders/), il faut disposer du *token* lié au compte GitHub de Geotribu :
-
-```bash
-export GH_TOKEN_MATERIAL_INSIDERS=************
-python -m pip install -U -r requirements-insiders.txt
+python -m pip install -U -r requirements.txt
 ```
 
 ### Générer le site
@@ -62,12 +51,6 @@ Version complète :
 mkdocs build
 ```
 
-Version complète gratuite :
-
-```bash
-mkdocs build -f mkdocs-free.yml
-```
-
 Version minimale (seulement certains plugins) :
 
 ```bash
@@ -82,12 +65,6 @@ Version complète :
 mkdocs serve --dirtyreload
 ```
 
-Version complète gratuite :
-
-```bash
-mkdocs serve -f mkdocs-free.yml --dirtyreload
-```
-
 Version minimale (seulement certains plugins) :
 
 ```bash
@@ -115,4 +92,4 @@ L'objectif de ce financement est de :
 - financer les outils open-source que l'on utilise pour le site :
     - Material for MkDocs (voir la page sponsor <https://github.com/sponsors/squidfunk>)
     - GeoRezo (pour le CDN)
-- financer les suffixes du nom de domaine (geotribu.fr/.net/.org)
+- financer le nom de domaine (geotribu.fr/.net/.org)

config/plugins_git-committers.yml

@@ -11,5 +11,4 @@ git-committers:
     - pre-commit-ci[bot]
     - web-flow
   repository: geotribu/website
-  token:
-    !ENV ["MKDOCS_GIT_COMMITTERS_APIKEY", !ENV ["GH_TOKEN_MATERIAL_INSIDERS"]]
+  token: !ENV ["MKDOCS_GIT_COMMITTERS_APIKEY"]

hooks/mkdocs/G000_load_subconfigs.py

@@ -7,11 +7,10 @@
 # standard library
 import logging
 from pathlib import Path
-from typing import Literal, Optional
+from typing import Literal
 
 # 3rd party
 import mkdocs.plugins
-from material import __version__ as material_version
 from mkdocs.config.defaults import MkDocsConfig
 from mkdocs.structure.pages import Page
 from mkdocs.utils.meta import get_data
@@ -62,20 +61,6 @@ def get_latest_content(
     return output_contents_list
 
 
-def is_mkdocs_theme_material_insiders() -> Optional[bool]:
-    """Check if the material theme is community or insiders edition.
-
-    Returns:
-        bool: True if the theme is Insiders edition. False if community.
-    """
-    if material_version is not None and "insiders" in material_version:
-        logger.debug(log_prefix + "Material theme edition INSIDERS")
-        return True
-    else:
-        logger.debug(log_prefix + "Material theme edition COMMUNITY")
-        return False
-
-
 # ###########################################################################
 # ########## Hooks #################
 # ##################################
@@ -99,28 +84,9 @@ def on_config(config: MkDocsConfig) -> MkDocsConfig:
     config_filename = Path(config.get("config_file_path")).name
     if config_filename == "mkdocs.yml":
         config["extra"]["website_flavor"] = "insiders"
-    elif config_filename == "mkdocs-free.yml":
-        config["extra"]["website_flavor"] = "community"
     else:
         config["extra"]["website_flavor"] = "minimal"
 
-    # check if insiders version is installed
-    if (
-        config["extra"]["website_flavor"] == "insiders"
-        and not is_mkdocs_theme_material_insiders()
-    ):
-        logger.warning(
-            log_prefix
-            + f"Le fichier {config.get('config_file_path')} contient des paramètres ou "
-            "plugins uniquement disponibles dans la version Insiders (payante) du thème "
-            "Material. Or c'est la version community (gratuite) qui est installée "
-            f"({material_version}). La génération va probablement échouer. Deux solutions :"
-            "A. Installer la version Insiders (requiert un jeton GitHub). "
-            "B. Utiliser la configuration basée sur la version communautaire (gratuite), "
-            "par exemple : 'mkdocs build -f mkdocs-free.yml'"
-        )
-        config["extra"]["website_flavor"] = "community"
-
     logger.info(
         log_prefix + f"Génération du site {config.get('site_name')} "
         f"en version {config.get('extra').get('website_flavor').upper()}"