From 8375254983354f1e9e5dc03b737a766d4cdece70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 23:35:36 +0000 Subject: [PATCH 1/2] build(deps-dev): Bump frequenz-repo-config in the repo-config group Bumps the repo-config group with 1 update: [frequenz-repo-config](https://github.com/frequenz-floss/frequenz-repo-config-python). Updates `frequenz-repo-config` from 0.18.0 to 0.19.0 - [Release notes](https://github.com/frequenz-floss/frequenz-repo-config-python/releases) - [Changelog](https://github.com/frequenz-floss/frequenz-repo-config-python/blob/v0.x.x/RELEASE_NOTES.md) - [Commits](https://github.com/frequenz-floss/frequenz-repo-config-python/compare/v0.18.0...v0.19.0) --- updated-dependencies: - dependency-name: frequenz-repo-config dependency-version: 0.19.0 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: repo-config ... Signed-off-by: dependabot[bot] --- pyproject.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 75f25280..a66f1ea1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "setuptools == 82.0.1", "setuptools_scm[toml] == 10.2.1", - "frequenz-repo-config[lib] == 0.18.0", + "frequenz-repo-config[lib] == 0.19.0", ] build-backend = "setuptools.build_meta" @@ -48,7 +48,7 @@ dev-formatting = ["black == 26.5.1", "isort == 8.0.1"] dev-mkdocs = [ "Markdown == 3.10.2", "black == 26.5.1", - "frequenz-repo-config[lib] == 0.18.0", + "frequenz-repo-config[lib] == 0.19.0", "markdown-callouts == 0.4.0", "markdown-svgbob == 202406.1023", "mike == 2.2.0", @@ -68,7 +68,7 @@ dev-mypy = [ "mypy == 2.3.0", "types-Markdown == 3.10.2.20260518", ] -dev-noxfile = ["nox == 2026.7.11", "frequenz-repo-config[lib] == 0.18.0"] +dev-noxfile = ["nox == 2026.7.11", "frequenz-repo-config[lib] == 0.19.0"] dev-pylint = [ # For checking the noxfile, docs/ script, and tests "frequenz-channels[dev-mkdocs,dev-noxfile,dev-pytest]", @@ -76,7 +76,7 @@ dev-pylint = [ ] dev-pytest = [ "async-solipsism == 0.9", - "frequenz-repo-config[extra-lint-examples] == 0.18.0", + "frequenz-repo-config[extra-lint-examples] == 0.19.0", "hypothesis == 6.163.0", "pytest == 9.1.1", "pytest-asyncio == 1.4.0", From 26b408d41041b7c84e0f54e3a2b401beb0fe06da Mon Sep 17 00:00:00 2001 From: "frequenz-auto-dependabot[bot]" <261417025+frequenz-auto-dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 23:35:55 +0000 Subject: [PATCH 2/2] Apply migration from 0.18.0 to 0.19.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit === v0.19.0 ========================================================= Script URL: https://raw.githubusercontent.com/frequenz-floss/frequenz-repo-config-python/v0.19.0/cookiecutter/migrate.py ======================================================================== Enabling exhaustive match checks for mypy... Updated pyproject.toml: enabled exhaustive-match ======================================================================== ======================================================================== Removing default `-vv` from pytest addopts... >>> pyproject.toml has a customized `addopts = "-W=all -Werror -Wdefault::DeprecationWarning -Wdefault::PendingDeprecationWarning -vv"` line under [tool.pytest.ini_options]; please drop `-vv` from it manually if appropriate. ======================================================================== Removing the dummy DCO merge-queue workflow... Removed .github/workflows/dco-merge-queue.yml ======================================================================== Pinning the DCO check in the 'Protect version branches' ruleset... Updated ruleset 'Protect version branches': pin 'DCO' status check to the DCO app ======================================================================== ======================================================================== Updating pinned build dependencies... Updated pyproject.toml: bumped setuptools to 84.0.0 ======================================================================== ======================================================================== Enabling asyncio debug mode for pytest... Updated pyproject.toml: enabled asyncio debug mode under [tool.pytest.ini_options] ======================================================================== ======================================================================== Updating the release instructions in CONTRIBUTING.md... Updated CONTRIBUTING.md: refreshed the release instructions ======================================================================== ⚠️⚠️⚠️ Remember to check the manual steps: ⚠️⚠️⚠️ ⚠️⚠️⚠️ 1. pyproject.toml has a customized `addopts = "-W=all -Werror -Wdefault::DeprecationWarning -Wdefault::PendingDeprecationWarning -vv"` line under [tool.pytest.ini_options]; please drop `-vv` from it manually if appropriate. ❌ Migration script finished but requires manual intervention ❌ The migration completed but requires manual intervention. Applied-by: frequenz-floss/gh-action-dependabot-migrate --- .github/workflows/dco-merge-queue.yml | 14 -------------- CONTRIBUTING.md | 20 +++++++++++++++++--- pyproject.toml | 4 +++- 3 files changed, 20 insertions(+), 18 deletions(-) delete mode 100644 .github/workflows/dco-merge-queue.yml diff --git a/.github/workflows/dco-merge-queue.yml b/.github/workflows/dco-merge-queue.yml deleted file mode 100644 index 7a4260de..00000000 --- a/.github/workflows/dco-merge-queue.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Based on https://github.com/hyperledger/besu/pull/5207/files -name: DCO -on: - merge_group: - -# Drop all token permissions: this workflow only runs a local echo command. -permissions: {} - -jobs: - DCO: - runs-on: ubuntu-slim - if: ${{ github.actor != 'dependabot[bot]' }} - steps: - - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76531be5..b2fe6f9e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,7 +53,7 @@ Or you can use `nox`: nox -R -s pytest -- tests/test_*.py ``` -The same appliest to `pylint` or `mypy` for example: +The same applies to `pylint` or `mypy` for example: ```sh nox -R -s pylint -- tests/test_*.py @@ -121,12 +121,19 @@ These are the steps to create a new release: 1. Get the latest head you want to create a release from. + If you use milestones, check that the milestone for this release has no open + issues left, and move whatever won't make it to a later milestone. + 2. Update the `RELEASE_NOTES.md` file if it is not complete, up to date, and - remove template comments (``) and empty sections. Submit a pull request if an update is needed, wait until it is merged, and update the latest head you want to create a release from to get the new merged pull request. + This can't be left for later: the notes published with the release are read + from the `RELEASE_NOTES.md` committed at the tagged commit, not from the tag + message. + 3. Create a new signed tag using the release notes and a [semver](https://semver.org/) compatible version number with a `v` prefix, for example: @@ -135,6 +142,10 @@ These are the steps to create a new release: git tag -s --cleanup=whitespace -F RELEASE_NOTES.md v0.0.1 ``` + The signature is not optional: the *Protect released tags* ruleset rejects + unsigned tags. It also forbids updating or deleting a released tag, so make + sure you are tagging the commit you want. + 4. Push the new tag. 5. A GitHub action will test the tag and if all goes well it will create @@ -153,4 +164,7 @@ These are the steps to create a new release: Commit the new release notes and create a PR (this step should be automated eventually too). -7. Celebrate! +7. If you use milestones, close the milestone for this release, and create the + next one if it doesn't exist yet. + +8. Celebrate! diff --git a/pyproject.toml b/pyproject.toml index a66f1ea1..b4940941 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ [build-system] requires = [ - "setuptools == 82.0.1", + "setuptools == 84.0.0", "setuptools_scm[toml] == 10.2.1", "frequenz-repo-config[lib] == 0.19.0", ] @@ -155,6 +155,7 @@ disable = [ [tool.pytest.ini_options] addopts = "-W=all -Werror -Wdefault::DeprecationWarning -Wdefault::PendingDeprecationWarning -vv" testpaths = ["tests", "src"] +asyncio_debug = true asyncio_mode = "auto" asyncio_default_fixture_loop_scope = "function" required_plugins = ["pytest-asyncio", "pytest-mock"] @@ -163,6 +164,7 @@ markers = [ ] [tool.mypy] +enable_error_code = ["exhaustive-match"] explicit_package_bases = true namespace_packages = true # This option disables mypy cache, and it is sometimes useful to enable it if