chore: Template upgrade

pawamoy · pawamoy · commit 2d418130f901 · 2023-05-10T20:08:53.000+02:00
diff --git a/.copier-answers.yml b/.copier-answers.yml
@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 0.15.2
+_commit: 0.15.5
 _src_path: gh:pawamoy/copier-pdm
 author_email: pawamoy@pm.me
 author_fullname: Timothée Mazzucotelli
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
         python-version: "3.8"
 
     - name: Resolving dependencies
-      run: pdm lock -v
+      run: pdm lock -v --no-cross-platform
 
     - name: Install dependencies
       run: pdm install -G duty -G docs -G quality -G typing -G security
@@ -78,7 +78,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
 
     - name: Resolving dependencies
-      run: pdm lock -v
+      run: pdm lock -v --no-cross-platform
 
     - name: Install dependencies
       run: pdm install --no-editable -G duty -G tests -G docs
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ pip-wheel-metadata/
 site/
 pdm.lock
 pdm.toml
+.pdm-plugins/
 .pdm-python
 __pypackages__/
 .venv/
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ help:
 
 .PHONY: lock
 lock:
-	@pdm lock
+	@pdm lock --no-cross-platform
 
 .PHONY: setup
 setup:
diff --git a/docs/css/mkdocstrings.css b/docs/css/mkdocstrings.css
@@ -4,7 +4,7 @@ div.doc-contents:not(.first) {
   border-left: .05rem solid var(--md-typeset-table-color);
 }
 
-/* Mark external links as such */
+/* Mark external links as such. */
 a.external::after,
 a.autorefs-external::after {
   /* https://primer.style/octicons/arrow-up-right-24 */
diff --git a/duties.py b/duties.py
@@ -5,7 +5,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from duty import duty
 from duty.callables import black, blacken_docs, coverage, lazy, mkdocs, mypy, pytest, ruff, safety
@@ -35,7 +35,29 @@ def pyprefix(title: str) -> str:  # noqa: D103
     return title
 
 
+def merge(d1: Any, d2: Any) -> Any:  # noqa: D103
+    basic_types = (int, float, str, bool, complex)
+    if isinstance(d1, dict) and isinstance(d2, dict):
+        for key, value in d2.items():
+            if key in d1:
+                if isinstance(d1[key], basic_types):
+                    d1[key] = value
+                else:
+                    d1[key] = merge(d1[key], value)
+            else:
+                d1[key] = value
+        return d1
+    if isinstance(d1, list) and isinstance(d2, list):
+        return d1 + d2
+    return d2
+
+
 def mkdocs_config() -> str:  # noqa: D103
+    from mkdocs import utils
+
+    # patch YAML loader to merge arrays
+    utils.merge = merge
+
     if "+insiders" in pkgversion("mkdocs-material"):
         return "mkdocs.insiders.yml"
     return "mkdocs.yml"
@@ -83,6 +105,7 @@ def check_quality(ctx: Context) -> None:
     Parameters:
         ctx: The context instance (passed automatically).
     """
+    os.environ["MYPYPATH"] = "src"
     ctx.run(
         ruff.check(*PY_SRC_LIST, config="config/ruff.toml"),
         title=pyprefix("Checking code quality"),
@@ -125,7 +148,6 @@ def check_types(ctx: Context) -> None:
     Parameters:
         ctx: The context instance (passed automatically).
     """
-    os.environ["MYPYPATH"] = "src"
     ctx.run(
         mypy.run(*PY_SRC_LIST, config_file="config/mypy.ini"),
         title=pyprefix("Type-checking"),
diff --git a/mkdocs.insiders.yml b/mkdocs.insiders.yml
@@ -1,4 +1,4 @@
 INHERIT: mkdocs.yml
 
 plugins:
-  typeset: {}
+- typeset
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -119,16 +119,16 @@ markdown_extensions:
     permalink: "¤"
 
 plugins:
-  autorefs: {}
-  search: {}
-  markdown-exec: {}
-  gen-files:
+- autorefs
+- search
+- markdown-exec
+- gen-files:
     scripts:
     - scripts/gen_ref_nav.py
-  literate-nav:
+- literate-nav:
     nav_file: SUMMARY.txt
-  coverage: {}
-  mkdocstrings:
+- coverage
+- mkdocstrings:
     handlers:
       python:
         paths: [src]
@@ -141,10 +141,10 @@ plugins:
           merge_init_into_class: true
           docstring_options:
             ignore_init_summary: true
-  git-committers:
+- git-committers:
     enabled: !ENV [DEPLOY, false]
     repository: mkdocstrings/python
-  minify:
+- minify:
     minify_html: !ENV [DEPLOY, false]
 
 extra:
diff --git a/pyproject.toml b/pyproject.toml
@@ -45,6 +45,9 @@ Funding = "https://github.com/sponsors/mkdocstrings"
 
 [tool.pdm]
 version = {source = "scm"}
+plugins = [
+    "pdm-multirun",
+]
 
 [tool.pdm.build]
 package-dir = "src"
diff --git a/scripts/setup.sh b/scripts/setup.sh
@@ -10,7 +10,7 @@ if ! command -v pdm &>/dev/null; then
     pipx install pdm
 fi
 if ! pdm self list 2>/dev/null | grep -q pdm-multirun; then
-    pipx inject pdm pdm-multirun
+    pdm install --plugins
 fi
 
 if [ -n "${PYTHON_VERSIONS}" ]; then

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ div.doc-contents:not(.first) {`
`4`	`4`	`border-left: .05rem solid var(--md-typeset-table-color);`
`5`	`5`	`}`
`6`	`6`
`7`		`-/* Mark external links as such */`
	`7`	`+/* Mark external links as such. */`
`8`	`8`	`a.external::after,`
`9`	`9`	`a.autorefs-external::after {`
`10`	`10`	`/* https://primer.style/octicons/arrow-up-right-24 */`