From 0432e4da962df3727d7b93db760c1d27b1a8e3df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:40:10 +0000 Subject: [PATCH 1/3] Bump the required group across 1 directory with 8 updates Bumps the required group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [mkdocs-material](https://github.com/squidfunk/mkdocs-material) | `9.5.43` | `9.5.47` | | [mkdocstrings[python]](https://github.com/mkdocstrings/mkdocstrings) | `0.26.2` | `0.27.0` | | [frequenz-repo-config[lib]](https://github.com/frequenz-floss/frequenz-repo-config-python) | `0.10.0` | `0.11.0` | | [pylint](https://github.com/pylint-dev/pylint) | `3.3.1` | `3.3.2` | | [pytest](https://github.com/pytest-dev/pytest) | `8.3.3` | `8.3.4` | | [frequenz-repo-config[extra-lint-examples]](https://github.com/frequenz-floss/frequenz-repo-config-python) | `0.10.0` | `0.11.0` | | [time-machine](https://github.com/adamchainz/time-machine) | `2.15.0` | `2.16.0` | | [hypothesis](https://github.com/HypothesisWorks/hypothesis) | `6.116.0` | `6.122.1` | Updates `mkdocs-material` from 9.5.43 to 9.5.47 - [Release notes](https://github.com/squidfunk/mkdocs-material/releases) - [Changelog](https://github.com/squidfunk/mkdocs-material/blob/master/CHANGELOG) - [Commits](https://github.com/squidfunk/mkdocs-material/compare/9.5.43...9.5.47) Updates `mkdocstrings[python]` from 0.26.2 to 0.27.0 - [Release notes](https://github.com/mkdocstrings/mkdocstrings/releases) - [Changelog](https://github.com/mkdocstrings/mkdocstrings/blob/main/CHANGELOG.md) - [Commits](https://github.com/mkdocstrings/mkdocstrings/compare/0.26.2...0.27.0) Updates `frequenz-repo-config[lib]` from 0.10.0 to 0.11.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.10.0...v0.11.0) Updates `pylint` from 3.3.1 to 3.3.2 - [Release notes](https://github.com/pylint-dev/pylint/releases) - [Commits](https://github.com/pylint-dev/pylint/compare/v3.3.1...v3.3.2) Updates `pytest` from 8.3.3 to 8.3.4 - [Release notes](https://github.com/pytest-dev/pytest/releases) - [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pytest-dev/pytest/compare/8.3.3...8.3.4) Updates `frequenz-repo-config[extra-lint-examples]` from 0.10.0 to 0.11.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.10.0...v0.11.0) Updates `time-machine` from 2.15.0 to 2.16.0 - [Changelog](https://github.com/adamchainz/time-machine/blob/main/CHANGELOG.rst) - [Commits](https://github.com/adamchainz/time-machine/compare/2.15.0...2.16.0) Updates `hypothesis` from 6.116.0 to 6.122.1 - [Release notes](https://github.com/HypothesisWorks/hypothesis/releases) - [Commits](https://github.com/HypothesisWorks/hypothesis/compare/hypothesis-python-6.116.0...hypothesis-python-6.122.1) --- updated-dependencies: - dependency-name: mkdocs-material dependency-type: direct:production update-type: version-update:semver-patch dependency-group: required - dependency-name: mkdocstrings[python] dependency-type: direct:production update-type: version-update:semver-minor dependency-group: required - dependency-name: frequenz-repo-config[lib] dependency-type: direct:production update-type: version-update:semver-minor dependency-group: required - dependency-name: pylint dependency-type: direct:production update-type: version-update:semver-patch dependency-group: required - dependency-name: pytest dependency-type: direct:production update-type: version-update:semver-patch dependency-group: required - dependency-name: frequenz-repo-config[extra-lint-examples] dependency-type: direct:production update-type: version-update:semver-minor dependency-group: required - dependency-name: time-machine dependency-type: direct:production update-type: version-update:semver-minor dependency-group: required - dependency-name: hypothesis dependency-type: direct:production update-type: version-update:semver-minor dependency-group: required ... Signed-off-by: dependabot[bot] --- pyproject.toml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 53635a9a..97d462ba 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,7 @@ requires = [ "setuptools == 75.6.0", "setuptools_scm[toml] == 8.1.0", - "frequenz-repo-config[lib] == 0.10.0", + "frequenz-repo-config[lib] == 0.11.0", ] build-backend = "setuptools.build_meta" @@ -69,9 +69,9 @@ dev-mkdocs = [ "mkdocs-gen-files == 0.5.0", "mkdocs-literate-nav == 0.6.1", "mkdocs-macros-plugin == 1.3.7", - "mkdocs-material == 9.5.43", - "mkdocstrings[python] == 0.26.2", - "frequenz-repo-config[lib] == 0.10.0", + "mkdocs-material == 9.5.47", + "mkdocstrings[python] == 0.27.0", + "frequenz-repo-config[lib] == 0.11.0", ] dev-mypy = [ "mypy == 1.13.0", @@ -82,21 +82,21 @@ dev-mypy = [ "types-protobuf == 5.28.3.20241030", "types-python-dateutil == 2.9.0.20241003", ] -dev-noxfile = ["nox == 2024.10.9", "frequenz-repo-config[lib] == 0.10.0"] +dev-noxfile = ["nox == 2024.10.9", "frequenz-repo-config[lib] == 0.11.0"] dev-pylint = [ - "pylint == 3.3.1", + "pylint == 3.3.2", # For checking the noxfile, docs/ script, and tests "frequenz-client-dispatch[cli,dev-mkdocs,dev-noxfile,dev-pytest]", "frequenz-api-dispatch == 1.0.0-rc1", ] dev-pytest = [ - "pytest == 8.3.3", - "frequenz-repo-config[extra-lint-examples] == 0.10.0", + "pytest == 8.3.4", + "frequenz-repo-config[extra-lint-examples] == 0.11.0", "pytest-mock == 3.14.0", "pytest-asyncio == 0.24.0", "async-solipsism == 0.7", - "time-machine == 2.15.0", - "hypothesis == 6.116.0", + "time-machine == 2.16.0", + "hypothesis == 6.122.1", "frequenz-client-dispatch[cli]", ] dev = [ From 6516b26325fb3af3ea4df0becb6d6839866b6ce4 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Mon, 2 Dec 2024 10:27:52 +0100 Subject: [PATCH 2/3] Apply new repo-config 0.11 templates Signed-off-by: Leandro Lucarella --- .github/containers/test-installation/Dockerfile | 2 +- .github/dependabot.yml | 8 ++++++++ pyproject.toml | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/containers/test-installation/Dockerfile b/.github/containers/test-installation/Dockerfile index 4637ed6f..478e6acb 100644 --- a/.github/containers/test-installation/Dockerfile +++ b/.github/containers/test-installation/Dockerfile @@ -3,7 +3,7 @@ # This Dockerfile is used to test the installation of the python package in # multiple platforms in the CI. It is not used to build the package itself. -FROM --platform=${TARGETPLATFORM} python:3.11-slim +FROM python:3.11-slim RUN apt-get update -y && \ apt-get install --no-install-recommends -y \ diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8978cb3c..23cd21b1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -39,3 +39,11 @@ updates: labels: - "part:tooling" - "type:tech-debt" + groups: + compatible: + update-types: + - "minor" + - "patch" + artifacts: + patterns: + - "actions/*-artifact" diff --git a/pyproject.toml b/pyproject.toml index 97d462ba..ff0da73b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -155,6 +155,8 @@ disable = [ "unsubscriptable-object", # Checked by mypy "no-member", + "possibly-used-before-assignment", + "no-name-in-module", # Checked by flake8 "redefined-outer-name", "unused-import", @@ -168,6 +170,7 @@ disable = [ [tool.pytest.ini_options] testpaths = ["tests", "src"] asyncio_mode = "auto" +asyncio_default_fixture_loop_scope = "function" required_plugins = ["pytest-asyncio", "pytest-mock"] [tool.mypy] From b4ae9e4849d51d81bef56459d834fba57dbbc677 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Mon, 2 Dec 2024 11:45:25 +0100 Subject: [PATCH 3/3] Revert "Include init files in sybil" This is now supported by repo-config directly. This reverts commit ae978c3fbc45a11cfee4df99729212a726530e79. Signed-off-by: Leandro Lucarella --- src/frequenz/client/conftest.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/frequenz/client/conftest.py b/src/frequenz/client/conftest.py index fcea02a4..c84af78f 100644 --- a/src/frequenz/client/conftest.py +++ b/src/frequenz/client/conftest.py @@ -10,9 +10,4 @@ from frequenz.repo.config.pytest import examples from sybil import Sybil -sybil_arguments = examples.get_sybil_arguments() -# Upstream includes "excludes" to work around a bug in Sybil. -# This bug seems to be fixed in our version of Sybil, so we remove it. -sybil_arguments.pop("excludes") - -pytest_collect_file = Sybil(**sybil_arguments).pytest() +pytest_collect_file = Sybil(**examples.get_sybil_arguments()).pytest()