From 4d2bdb7b3731bf8dc7f4d137e6c6cc5dd0a38435 Mon Sep 17 00:00:00 2001 From: Rene Pietzsch Date: Thu, 3 Sep 2026 18:17:43 +0200 Subject: [PATCH] Bump mkdocs-material to 9.7.7 and drop Insiders Insiders features merged into public release as of 9.7.0; remove the private insiders dependency, switching tasks, and CI access-token steps. --- .github/workflows/pages.yml | 3 --- .github/workflows/test.yml | 3 --- .gitpod.yml | 2 -- Taskfile.yml | 23 ------------------ mkdocs.yml | 4 ++-- poetry.lock | 47 +++++++++++++++++-------------------- pyproject.toml | 3 +-- 7 files changed, 24 insertions(+), 61 deletions(-) diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml index 1edc1f512..55e156f24 100644 --- a/.github/workflows/pages.yml +++ b/.github/workflows/pages.yml @@ -68,9 +68,6 @@ jobs: - name: install packages run: sudo apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev - - name: reconfigure private repository access - run: ACCESS_TOKEN=${{ secrets.ACCESS_TOKEN }} task use:insider-https-token - - name: check run: task check diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 80e30550e..0c8b3b7f0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -58,9 +58,6 @@ jobs: - name: install packages run: sudo apt-get install -y libcairo2-dev libfreetype6-dev libffi-dev libjpeg-dev libpng-dev libz-dev - - name: reconfigure private repository access - run: ACCESS_TOKEN=${{ secrets.ACCESS_TOKEN }} task use:insider-https-token - - name: test run: task test:unit diff --git a/.gitpod.yml b/.gitpod.yml index 8f0ffdde6..3bb0c4225 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,8 +4,6 @@ tasks: - name: setup before: | brew install go-task/tap/go-task - init: | - task use:insider-https-token command: | task serve github: diff --git a/Taskfile.yml b/Taskfile.yml index a5ab440ee..dfca198c7 100644 --- a/Taskfile.yml +++ b/Taskfile.yml @@ -8,8 +8,6 @@ dotenv: ['.env'] vars: PUBLIC_BRANCH: published CURRENT_VERSION: 26.2 - MATERIAL_TAG: 9.6.14 - MATERIAL_INSIDER_TAG: 9.6.14-insiders-4.53.16 # the markdown linter command, used by format:fix:path and check:rumdl RUMDL_CHECK: poetry run rumdl --config .markdownlint.jsonc check # the default lint targets: the docs tree plus the top-level markdown files @@ -99,27 +97,6 @@ tasks: cmds: - poetry run mkdocs serve - use:public: - desc: switch to public package (non insider) - cmds: - - poetry remove mkdocs-material || exit 0 - - poetry add mkdocs-material=={{.MATERIAL_TAG}} - - poetry update - - use:insider-ssh: - desc: switch to insider package from github:eccenca via ssh (default) - cmds: - - poetry remove mkdocs-material || exit 0 - - poetry add git+ssh://git@github.com:eccenca/mkdocs-material-insiders.git#{{.MATERIAL_INSIDER_TAG}} - - poetry update - - use:insider-https-token: - desc: switch to insider package from github:eccenca via ACCESS_TOKEN variable (build plan) - cmds: - - poetry remove mkdocs-material || exit 0 - - poetry add git+https://$ACCESS_TOKEN@github.com/eccenca/mkdocs-material-insiders.git#{{.MATERIAL_INSIDER_TAG}} - - poetry update - update:icons: desc: update the used eccenca icons from carbon cmds: diff --git a/mkdocs.yml b/mkdocs.yml index 06c83354c..702798c56 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -59,7 +59,7 @@ extra: Validation: validation Filesystem: material-file-tree Volume: fontawesome-solid-hard-drive - "Load Balancer": simple-awselasticloadbalancing + "Load Balancer": load-balancer Variables: variables JDBC: jdbc Package: package @@ -187,7 +187,7 @@ theme: keycloak: material/openid validation: octicons/verified-16 material-file-tree: material/file-tree - simple-awselasticloadbalancing: simple/awselasticloadbalancing + load-balancer: material/router-network fontawesome-solid-hard-drive: fontawesome/solid/hard-drive variables: material/variable-box jdbc: material/database diff --git a/poetry.lock b/poetry.lock index cfbe26048..d4199642c 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 2.3.3 and should not be changed by hand. +# This file is automatically @generated by Poetry 2.4.1 and should not be changed by hand. [[package]] name = "aiohappyeyeballs" @@ -1252,38 +1252,33 @@ test = ["mkdocs-d2-plugin", "mkdocs-include-markdown-plugin", "mkdocs-macros-tes [[package]] name = "mkdocs-material" -version = "9.6.14+insiders.4.53.16" +version = "9.7.7" description = "Documentation that simply works" optional = false python-versions = ">=3.8" groups = ["main"] -files = [] -develop = false +files = [ + {file = "mkdocs_material-9.7.7-py3-none-any.whl", hash = "sha256:8ea9bb1737a5b524a5f9dcf2e1b4ebda8274ae3008aa7845720a97083bef708f"}, + {file = "mkdocs_material-9.7.7.tar.gz", hash = "sha256:c0649c065b1b0512d60aad8c10f947f8e455284475239b364b610f2deb4d0855"}, +] [package.dependencies] -babel = ">=2.10,<3.0" -backrefs = ">=5.7.post1,<6.0" -colorama = ">=0.4,<1.0" -jinja2 = ">=3.1,<4.0" -markdown = ">=3.2,<4.0" -mergedeep = ">=1.3,<2.0" -mkdocs = ">=1.6,<2.0" -mkdocs-material-extensions = ">=1.3,<2.0" -paginate = ">=0.5,<1.0" -pygments = ">=2.16,<3.0" -pymdown-extensions = ">=10.2,<11.0" -requests = ">=2.26,<3.0" +babel = ">=2.10" +backrefs = ">=5.7.post1" +colorama = ">=0.4" +jinja2 = ">=3.1" +markdown = ">=3.2" +mkdocs = ">=1.6,<2" +mkdocs-material-extensions = ">=1.3" +paginate = ">=0.5" +pygments = ">=2.16" +pymdown-extensions = ">=10.2" +requests = ">=2.30" [package.extras] -git = ["mkdocs-git-committers-plugin-2 (>=1.1,<3)", "mkdocs-git-revision-date-localized-plugin (>=1.2.4,<2.0)"] -imaging = ["cairosvg (>=2.6,<3.0)", "pillow (>=10.2,<11.0)"] -recommended = ["mkdocs-minify-plugin (>=0.7,<1.0)", "mkdocs-redirects (>=1.2,<2.0)", "mkdocs-rss-plugin (>=1.6,<2.0)"] - -[package.source] -type = "git" -url = "ssh://git@github.com/eccenca/mkdocs-material-insiders.git" -reference = "9.6.14-insiders-4.53.16" -resolved_reference = "ce2cca8c5240ae520e09a67954de09949bd04efe" +git = ["mkdocs-git-committers-plugin-2 (>=1.1)", "mkdocs-git-revision-date-localized-plugin (>=1.2.4)"] +imaging = ["cairosvg (>=2.6)", "pillow (>=10.2)"] +recommended = ["mkdocs-minify-plugin (>=0.7)", "mkdocs-redirects (>=1.2)", "mkdocs-rss-plugin (>=1.6)"] [[package]] name = "mkdocs-material-extensions" @@ -2647,4 +2642,4 @@ propcache = ">=0.2.1" [metadata] lock-version = "2.1" python-versions = "^3.11" -content-hash = "b29564f7e517705f8e3acab382a355450ede6affa5d79e085c0200fe8284f134" +content-hash = "2f784c74a0236032936de194383a78c772d9082a976aa8598332eed654fe9164" diff --git a/pyproject.toml b/pyproject.toml index 654e2fc25..ed6614709 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,8 +26,7 @@ mkdocs-macros-plugin = "^1.3.7" mkdocs-autolinks-plugin = "^0.7.1" mkdocs-redirects = "^1.2.2" mkdocs-swagger-ui-tag = "^0.7.1" -# if you change this - change also the version ID in Taskfile.yml -mkdocs-material = {git = "git@github.com:eccenca/mkdocs-material-insiders.git", rev = "9.6.14-insiders-4.53.16"} +mkdocs-material = "9.7.7" cmem-cmempy = "^25.3.0" pydantic = "^2.11.7" jinja2 = "^3.1.6"