Merge branch 'master' into master

geotribu · Feb 2, 2025 · 8a8db1d · 8a8db1d
2 parents b77ae91 + 322044f
commit 8a8db1d
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 30 deletions.
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@v7
+        uses: dawidd6/action-download-artifact@v8
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           name: pr-build-website

diff --git a/config/plugins_meta.yml b/config/plugins_meta.yml
@@ -0,0 +1,2 @@
+meta:
+  meta_file: "content/**/.meta.yml"
diff --git a/config/plugins_minify.yml b/config/plugins_minify.yml
@@ -0,0 +1,8 @@
+minify:
+  minify_css: true
+  css_files:
+    - theme/assets/stylesheets/extra.css
+    - theme/assets/stylesheets/homepage.css
+  minify_html: true
+  htmlmin_opts:
+    remove_comments: true
diff --git a/config/plugins_tags.yml b/config/plugins_tags.yml
@@ -0,0 +1,4 @@
+tags:
+  enabled: !ENV [MKDOCS_ENABLE_PLUGIN_TAGS, true]
+  tags_sort_by: !!python/name:material.plugins.tags.tag_name_casefold
+  listings_sort_by: !!python/name:material.plugins.tags.item_url
diff --git a/mkdocs-free.yml b/mkdocs-free.yml
@@ -47,11 +47,6 @@ plugins:
   - macros:
       include_dir: content/toc_nav_ignored/snippets
       module_name: hooks/macros/custom_jinja
-  - minify:
-      minify_css: true
-      css_files:
-        - theme/assets/stylesheets/extra.css
-        - theme/assets/stylesheets/homepage.css
   - search:
       lang: fr
   - social:
@@ -60,9 +55,6 @@ plugins:
       cards: !ENV [MKDOCS_ENABLE_PLUGIN_SOCIAL_CARDS, false]
       cards_layout_options:
         font_family: Ubuntu
-  - tags:
-      enabled: !ENV [MKDOCS_ENABLE_PLUGIN_TAGS, true]
-      tags_file: tags.md
   - termynal
 
 # Theme

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -45,26 +45,9 @@ plugins:
       enable_creation_date: true
       fallback_to_build_date: true
       locale: fr
-  - meta:
-      meta_file: "content/**/.meta.yml"
-  - minify:
-      minify_css: true
-      css_files:
-        - theme/assets/stylesheets/extra.css
-        - theme/assets/stylesheets/homepage.css
-      minify_html: true
-      htmlmin_opts:
-        remove_comments: true
-  - search:
-      lang: fr
   - macros:
       include_dir: content/toc_nav_ignored/snippets
       module_name: hooks/macros/custom_jinja
-  - tags:
-      enabled: !ENV [MKDOCS_ENABLE_PLUGIN_TAGS, true]
-      tags_sort_by: !!python/name:material.plugins.tags.tag_name_casefold
-      listings_sort_by: !!python/name:material.plugins.tags.item_url
-  - termynal
   - privacy:
       enabled: !ENV [MKDOCS_ENABLE_PLUGIN_PRIVACY, false]
       cache_dir:
@@ -101,6 +84,8 @@ plugins:
         - boundlessgeo.com/*
         - i3.codeplex.com/*
         - drfhlmcehrc34.cloudfront.net/*
+  - search:
+      lang: fr
   - social:
       enabled: !ENV [MKDOCS_ENABLE_PLUGIN_SOCIAL, false]
       cache_dir: !ENV [MKDOCS_PLUGIN_SOCIAL_CACHE_DIR, .cache/plugins/social]
@@ -112,6 +97,7 @@ plugins:
         background_image: content/theme/assets/images/geotribu/background_geotribu.png
         color: "#3e93a7"
         font_family: Ubuntu
+  - termynal
   - typeset:
       enabled: !ENV [MKDOCS_ENABLE_PLUGIN_TYPESET, true]
 

diff --git a/requirements-free.txt b/requirements-free.txt
@@ -1,6 +1,6 @@
 # No Material Insiders
 # --------------------
 
-mkdocs-material[imaging]>=9.5.50,<9.6
+mkdocs-material[imaging]>=9.6.1,<9.7
 
 -r requirements.txt
diff --git a/requirements-insiders.txt b/requirements-insiders.txt
@@ -1,11 +1,11 @@
 # Insiders
 # --------
 
-git+https://${GH_TOKEN_MATERIAL_INSIDERS}@github.com/squidfunk/mkdocs-material-insiders.git@9.5.50-insiders-4.53.15#egg=mkdocs-material
+git+https://${GH_TOKEN_MATERIAL_INSIDERS}@github.com/squidfunk/mkdocs-material-insiders.git@9.6.1-insiders-4.53.15#egg=mkdocs-material
 # git+https://${GH_TOKEN_MATERIAL_INSIDERS}@github.com/squidfunk/mkdocs-material-insiders.git
 
 # social plugin requirements
 cairosvg~=2.7
-Pillow>=10.3,<10.5
+Pillow>=10.3,<11.2
 
 -r requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -3,7 +3,7 @@
 # Development
 # -----------------------
 geotribu>=0.34.3,<1
-pre-commit>=3,<4
+pre-commit>=3,<5
 
 # Project requirements
 # -----------------------