Skip to content

Commit acccfef

Browse files
authored
Bump the required group across 1 directory with 5 updates (#348)
2 parents f5917d5 + 0049e15 commit acccfef

File tree

15 files changed

+37
-37
lines changed

15 files changed

+37
-37
lines changed

RELEASE_NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@ All upgrading should be done via the migration script or regenerating the templa
3333

3434
### Cookiecutter template
3535

36-
<!-- Here bug fixes for cookiecutter specifically -->
36+
- Fixed a compatibility issue in the macros doc script with `mkdocsstrings` 0.28.

cookiecutter/{{cookiecutter.github_repo_name}}/docs/_scripts/macros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ def _hook_macros_plugin(env: macros.MacrosPlugin) -> None:
4747
update_env = python_handler.update_env
4848

4949
# override the `update_env` method of the Python handler
50-
def patched_update_env(markdown: md.Markdown, config: dict[str, Any]) -> None:
51-
update_env(markdown, config)
50+
def patched_update_env(md: md.Markdown, config: dict[str, Any]) -> None:
51+
update_env(md=md, config=config)
5252

5353
# get the `convert_markdown` filter of the env
5454
convert_markdown = python_handler.env.filters["convert_markdown"]

cookiecutter/{{cookiecutter.github_repo_name}}/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ dev-mkdocs = [
9999
"mkdocs-literate-nav == 0.6.1",
100100
"mkdocs-macros-plugin == 1.3.7",
101101
"mkdocs-material == 9.5.45",
102-
"mkdocstrings[python] == 0.27.0",
103-
"mkdocstrings-python == 1.12.2",
102+
"mkdocstrings[python] == 0.28.0",
103+
"mkdocstrings-python == 1.14.0",
104104
"frequenz-repo-config[{{cookiecutter.type}}] == 0.11.0",
105105
]
106106
dev-mypy = [

docs/_scripts/macros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def _hook_macros_plugin(env: macros.MacrosPlugin) -> None:
7575
update_env = python_handler.update_env
7676

7777
# override the `update_env` method of the Python handler
78-
def patched_update_env(markdown: md.Markdown, config: dict[str, Any]) -> None:
79-
update_env(markdown, config)
78+
def patched_update_env(md: md.Markdown, config: dict[str, Any]) -> None:
79+
update_env(md=md, config=config)
8080

8181
# get the `convert_markdown` filter of the env
8282
convert_markdown = python_handler.env.filters["convert_markdown"]

pyproject.toml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Copyright © 2023 Frequenz Energy-as-a-Service GmbH
33

44
[build-system]
5-
requires = ["setuptools == 75.6.0", "setuptools_scm[toml] == 8.1.0"]
5+
requires = ["setuptools == 75.8.0", "setuptools_scm[toml] == 8.1.0"]
66
build-backend = "setuptools.build_meta"
77

88
[project]
@@ -69,8 +69,8 @@ extra-lint-examples = [
6969
dev-flake8 = [
7070
"flake8 == 7.1.1",
7171
"flake8-docstrings == 1.7.0",
72-
"flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml
73-
"pydoclint == 0.5.14",
72+
"flake8-pyproject == 1.2.3", # For reading the flake8 config from pyproject.toml
73+
"pydoclint == 0.6.0",
7474
"pydocstyle == 6.3.0",
7575
]
7676
dev-formatting = ["black == 24.10.0", "isort == 5.13.2"]
@@ -81,13 +81,13 @@ dev-mkdocs = [
8181
"mkdocs-gen-files == 0.5.0",
8282
"mkdocs-literate-nav == 0.6.1",
8383
"mkdocs-macros-plugin == 1.3.7",
84-
"mkdocs-material == 9.5.49",
85-
"mkdocstrings[python] == 0.27.0",
84+
"mkdocs-material == 9.6.2",
85+
"mkdocstrings[python] == 0.28.0",
8686
"mkdocstrings-python == 1.13.0",
8787
]
8888
dev-mypy = [
8989
"mypy == 1.14.1",
90-
"types-setuptools >= 67.6.0, < 76", # Should match the build dependency
90+
"types-setuptools >= 67.6.0, < 76", # Should match the build dependency
9191
"types-Markdown == 3.7.0.20241204",
9292
"types-PyYAML == 6.0.12.20241230",
9393
"types-babel == 2.11.0.15",
@@ -100,14 +100,14 @@ dev-pylint = [
100100
# dev-pytest already defines a dependency to pylint because of the examples
101101
# For checking the noxfile, docs/ script, and tests
102102
"frequenz-repo-config[dev-mkdocs,dev-noxfile,dev-pytest]",
103-
"setuptools >= 67.6.0, < 76", # Should match the build dependency
103+
"setuptools >= 67.6.0, < 76", # Should match the build dependency
104104
]
105105
dev-pytest = [
106106
"pytest == 8.3.4",
107-
"pylint == 3.3.3", # We need this to check for the examples
107+
"pylint == 3.3.4", # We need this to check for the examples
108108
"cookiecutter == 2.6.0", # For checking the cookiecutter scripts
109-
"jinja2 == 3.1.5", # For checking the cookiecutter scripts
110-
"sybil >= 6.1.1, < 10", # Should be consistent with the extra-lint-examples dependency
109+
"jinja2 == 3.1.5", # For checking the cookiecutter scripts
110+
"sybil >= 6.1.1, < 10", # Should be consistent with the extra-lint-examples dependency
111111
]
112112
dev = [
113113
"frequenz-repo-config[dev-mkdocs,dev-flake8,dev-formatting,dev-mkdocs,dev-mypy,dev-noxfile,dev-pylint,dev-pytest]",

tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/docs/_scripts/macros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ def _hook_macros_plugin(env: macros.MacrosPlugin) -> None:
4747
update_env = python_handler.update_env
4848

4949
# override the `update_env` method of the Python handler
50-
def patched_update_env(markdown: md.Markdown, config: dict[str, Any]) -> None:
51-
update_env(markdown, config)
50+
def patched_update_env(md: md.Markdown, config: dict[str, Any]) -> None:
51+
update_env(md=md, config=config)
5252

5353
# get the `convert_markdown` filter of the env
5454
convert_markdown = python_handler.env.filters["convert_markdown"]

tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ dev-mkdocs = [
5858
"mkdocs-literate-nav == 0.6.1",
5959
"mkdocs-macros-plugin == 1.3.7",
6060
"mkdocs-material == 9.5.45",
61-
"mkdocstrings[python] == 0.27.0",
62-
"mkdocstrings-python == 1.12.2",
61+
"mkdocstrings[python] == 0.28.0",
62+
"mkdocstrings-python == 1.14.0",
6363
"frequenz-repo-config[actor] == 0.11.0",
6464
]
6565
dev-mypy = [

tests_golden/integration/test_cookiecutter_generation/api/frequenz-api-test/docs/_scripts/macros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ def _hook_macros_plugin(env: macros.MacrosPlugin) -> None:
4747
update_env = python_handler.update_env
4848

4949
# override the `update_env` method of the Python handler
50-
def patched_update_env(markdown: md.Markdown, config: dict[str, Any]) -> None:
51-
update_env(markdown, config)
50+
def patched_update_env(md: md.Markdown, config: dict[str, Any]) -> None:
51+
update_env(md=md, config=config)
5252

5353
# get the `convert_markdown` filter of the env
5454
convert_markdown = python_handler.env.filters["convert_markdown"]

tests_golden/integration/test_cookiecutter_generation/api/frequenz-api-test/pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ dev-mkdocs = [
6969
"mkdocs-literate-nav == 0.6.1",
7070
"mkdocs-macros-plugin == 1.3.7",
7171
"mkdocs-material == 9.5.45",
72-
"mkdocstrings[python] == 0.27.0",
73-
"mkdocstrings-python == 1.12.2",
72+
"mkdocstrings[python] == 0.28.0",
73+
"mkdocstrings-python == 1.14.0",
7474
"frequenz-repo-config[api] == 0.11.0",
7575
]
7676
dev-mypy = [

tests_golden/integration/test_cookiecutter_generation/app/frequenz-app-test/docs/_scripts/macros.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ def _hook_macros_plugin(env: macros.MacrosPlugin) -> None:
4747
update_env = python_handler.update_env
4848

4949
# override the `update_env` method of the Python handler
50-
def patched_update_env(markdown: md.Markdown, config: dict[str, Any]) -> None:
51-
update_env(markdown, config)
50+
def patched_update_env(md: md.Markdown, config: dict[str, Any]) -> None:
51+
update_env(md=md, config=config)
5252

5353
# get the `convert_markdown` filter of the env
5454
convert_markdown = python_handler.env.filters["convert_markdown"]

0 commit comments

Comments
 (0)