Skip to content

Commit 1350daf

Browse files
authored
Bug fixes for v0.6.2 (frequenz-floss#137)
This PR fixes a few issues in v0.6.1 and prepares for the release of v0.6.2. - Update docs and template version - Exclude benchmarks from the source distribution - Replace `section-indexes` with `navigation.indexes`
2 parents 6ed2cf0 + f6b80b9 commit 1350daf

File tree

24 files changed

+49
-66
lines changed

24 files changed

+49
-66
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ directory will be created with the generated project name. For example:
4242
cd ~/devel
4343
cookiecutter gh:frequenz-floss/frequenz-repo-config-python \
4444
--directory=cookiecutter \
45-
--checkout v0.5.2
45+
--checkout v0.6.2
4646
```
4747

4848
This command will prompt you for the project type, name, and other

RELEASE_NOTES.md

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
11
# Frequenz Repository Configuration Release Notes
22

3-
## Summary
4-
5-
<!-- Here goes a general summary of what this release is about -->
6-
7-
## Upgrading
8-
9-
<!-- Here goes notes on how to upgrade from previous versions, including deprecations and what they should be replaced with -->
10-
11-
### Cookiecutter template
12-
13-
<!-- Here upgrade steps for cookiecutter specifically -->
14-
15-
## New Features
16-
17-
<!-- Here goes the main new features and examples or instructions on how to use them -->
18-
19-
### Cookiecutter template
20-
21-
<!-- Here new features for cookiecutter specifically -->
22-
233
## Bug Fixes
244

25-
<!-- Here goes notable bug fixes that are worth a special mention or explanation -->
5+
- Update the version used in the documentation.
266

277
### Cookiecutter template
288

29-
<!-- Here bug fixes for cookiecutter specifically -->
9+
- Update the generated version in dependencies.
10+
- Exclude `benchmarks/` directory from source distribution.
11+
- Use the native `navigation.indexes` extension from `mkdocs-material` instead of the `section-indexes` plugin.
12+
13+
The plugin had some issues when failing to keep up to date.

cookiecutter/{{cookiecutter.github_repo_name}}/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ exclude mkdocs.yml
1010
exclude noxfile.py
1111
exclude src/conftest.py
1212
recursive-exclude .github *
13+
recursive-exclude benchmarks *
1314
recursive-exclude docs *
1415
{%- if cookiecutter.type == "api" %}
1516
recursive-exclude pytests *

cookiecutter/{{cookiecutter.github_repo_name}}/mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ theme:
2727
features:
2828
- content.code.annotate
2929
- content.code.copy
30+
- navigation.indexes
3031
- navigation.instant
3132
- navigation.tabs
3233
- navigation.top
@@ -119,7 +120,6 @@ plugins:
119120
{%- endif %}
120121
- https://typing-extensions.readthedocs.io/en/stable/objects.inv
121122
- search
122-
- section-index
123123

124124
# Preview controls
125125
watch:

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
requires = [
66
"setuptools == 68.1.0",
77
"setuptools_scm[toml] == 7.1.0",
8-
"frequenz-repo-config[{{cookiecutter.type}}] == 0.5.2",
8+
"frequenz-repo-config[{{cookiecutter.type}}] == 0.6.2",
99
]
1010
build-backend = "setuptools.build_meta"
1111

@@ -73,9 +73,8 @@ dev-mkdocs = [
7373
"mkdocs-gen-files == 0.5.0",
7474
"mkdocs-literate-nav == 0.6.0",
7575
"mkdocs-material == 9.1.21",
76-
"mkdocs-section-index == 0.3.5",
7776
"mkdocstrings[python] == 0.22.0",
78-
"frequenz-repo-config[{{cookiecutter.type}}] == 0.5.2",
77+
"frequenz-repo-config[{{cookiecutter.type}}] == 0.6.2",
7978
]
8079
dev-mypy = [
8180
"mypy == 1.5.1",
@@ -87,7 +86,7 @@ dev-mypy = [
8786
]
8887
dev-noxfile = [
8988
"nox == 2023.4.22",
90-
"frequenz-repo-config[{{cookiecutter.type}}] == 0.5.2",
89+
"frequenz-repo-config[{{cookiecutter.type}}] == 0.6.2",
9190
]
9291
dev-pylint = [
9392
"pylint == 2.17.5",
@@ -96,7 +95,7 @@ dev-pylint = [
9695
]
9796
dev-pytest = [
9897
"pytest == 7.4.0",
99-
"frequenz-repo-config[extra-lint-examples] == 0.5.2",
98+
"frequenz-repo-config[extra-lint-examples] == 0.6.2",
10099
{%- if cookiecutter.type != "api" %}
101100
"pytest-mock == 3.11.1",
102101
"pytest-asyncio == 0.21.1",

docs/index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Then simply run [Cookiecutter] where you want to create the new project:
3535

3636
```sh
3737
cookiecutter gh:frequenz-floss/frequenz-repo-config-python \
38-
--directory=cookiecutter --checkout v0.5.2
38+
--directory=cookiecutter --checkout v0.6.2
3939
```
4040

4141
This command will prompt you for the project type, name, and other
@@ -238,7 +238,7 @@ the files in your existing project by using `rsync` or similar tools:
238238
```sh
239239
cd /tmp
240240
cookiecutter gh:frequenz-floss/frequenz-repo-config-python \
241-
--directory=cookiecutter --checkout v0.5.2
241+
--directory=cookiecutter --checkout v0.6.2
242242
rsync -vr --exclude=.git/ new-project/ /path/to/existing/project
243243
cd /path/to/existing/project
244244
git diff
@@ -283,7 +283,7 @@ git commit -a # commit all changes
283283
cd ..
284284
cookiecutter gh:frequenz-floss/frequenz-repo-config-python \
285285
--directory=cookiecutter \
286-
--checkout v0.5.2 \
286+
--checkout v0.6.2 \
287287
--overwrite-if-exists \
288288
--replay \
289289
--replay-file project-directory/.cookiecutter-replay.json

mkdocs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ theme:
2424
features:
2525
- content.code.annotate
2626
- content.code.copy
27+
- navigation.indexes
2728
- navigation.instant
2829
- navigation.tabs
2930
- navigation.top
@@ -112,7 +113,6 @@ plugins:
112113
- https://sybil.readthedocs.io/en/stable/objects.inv
113114
- https://typing-extensions.readthedocs.io/en/stable/objects.inv
114115
- search
115-
- section-index
116116

117117
# Preview controls
118118
watch:

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ dev-mkdocs = [
7474
"mkdocs-gen-files == 0.5.0",
7575
"mkdocs-literate-nav == 0.6.0",
7676
"mkdocs-material == 9.1.21",
77-
"mkdocs-section-index == 0.3.5",
7877
"mkdocstrings[python] == 0.22.0",
7978
]
8079
dev-mypy = [

src/frequenz/repo/config/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
# ...
290290
dev-pytest = [
291291
# ...
292-
"frequenz-repo-config[extra-lint-examples] == 0.5.2",
292+
"frequenz-repo-config[extra-lint-examples] == 0.6.2",
293293
]
294294
# ...
295295
[[tool.mypy.overrides]]
@@ -402,7 +402,7 @@
402402
requires = [
403403
"setuptools >= 67.3.2, < 68",
404404
"setuptools_scm[toml] >= 7.1.0, < 8",
405-
"frequenz-repo-config[api] >= 0.5.2, < 0.6.0",
405+
"frequenz-repo-config[api] >= 0.6.2, < 0.7.0",
406406
]
407407
build-backend = "setuptools.build_meta"
408408

tests_golden/integration/test_cookiecutter_generation/actor/frequenz-actor-test/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ exclude mkdocs.yml
77
exclude noxfile.py
88
exclude src/conftest.py
99
recursive-exclude .github *
10+
recursive-exclude benchmarks *
1011
recursive-exclude docs *
1112
recursive-exclude tests *
1213
recursive-include py *.pyi

0 commit comments

Comments
 (0)