From 61547c972d2c1a416c2d360bb514e4e022d8f397 Mon Sep 17 00:00:00 2001 From: the Mulhern Date: Thu, 3 Sep 2026 14:20:40 -0400 Subject: [PATCH 1/2] Do not use obsolete entrypoint to invoke Python coverage tool Signed-off-by: the Mulhern --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 508524f..be149e6 100644 --- a/Makefile +++ b/Makefile @@ -13,9 +13,9 @@ test: .PHONY: coverage coverage: - coverage --version - coverage run --timid --branch -m unittest discover tests - coverage report -m --fail-under=100 --show-missing --include="./src/*" + python3 -m coverage --version + python3 -m coverage run --timid --branch -m unittest discover tests + python3 -m coverage report -m --fail-under=100 --show-missing --include="./src/*" .PHONY: fmt fmt: From 2c6d443859ab6a1c10229ff7adcccfc6799d943a Mon Sep 17 00:00:00 2001 From: the Mulhern Date: Thu, 3 Sep 2026 14:28:08 -0400 Subject: [PATCH 2/2] Increase CURRENT DEVELOPMENT ENVIRONMENT to 44 Signed-off-by: the Mulhern --- .github/workflows/main.yml | 6 +++--- src/into_dbus_python/_errors.py | 1 + src/into_dbus_python/_xformer.py | 6 +++--- tests/test_hypothesis.py | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d76945c..1d711e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -40,7 +40,7 @@ jobs: - dependencies: python python3-build twine task: make -f Makefile package runs-on: ubuntu-latest - container: fedora:43 # CURRENT DEVELOPMENT ENVIRONMENT + container: fedora:44 # CURRENT DEVELOPMENT ENVIRONMENT steps: - uses: actions/checkout@v6 with: @@ -68,7 +68,7 @@ jobs: python3-hypothesis task: PYTHONPATH=./src make -f Makefile test runs-on: ubuntu-latest - container: fedora:43 # CURRENT DEVELOPMENT ENVIRONMENT + container: fedora:44 # CURRENT DEVELOPMENT ENVIRONMENT steps: - name: Install python3.12 run: > @@ -103,4 +103,4 @@ jobs: general_checks: uses: stratis-storage/github-actions/.github/workflows/reusable_general.yml@master with: - fedora-container-image-number: 43 # CURRENT DEVELOPMENT ENVIRONMENT + fedora-container-image-number: 44 # CURRENT DEVELOPMENT ENVIRONMENT diff --git a/src/into_dbus_python/_errors.py b/src/into_dbus_python/_errors.py index 97d33bd..af6155f 100644 --- a/src/into_dbus_python/_errors.py +++ b/src/into_dbus_python/_errors.py @@ -14,6 +14,7 @@ """ Error hierarchy for xformer generator. """ + # isort: STDLIB from typing import Any, Union diff --git a/src/into_dbus_python/_xformer.py b/src/into_dbus_python/_xformer.py index a6ca219..c15e2bb 100644 --- a/src/into_dbus_python/_xformer.py +++ b/src/into_dbus_python/_xformer.py @@ -99,8 +99,8 @@ def the_func(a_tuple, *, variant=0): :rtype: object """ try: - (signature, an_obj) = a_tuple - (func, sig) = self.COMPLETE.parseString(signature)[0] + signature, an_obj = a_tuple + func, sig = self.COMPLETE.parseString(signature)[0] # Allow KeyboardInterrupt error to be propagated except KeyboardInterrupt as err: # pragma: no cover raise err @@ -147,7 +147,7 @@ def the_dict_func(a_dict, *, variant=0): return (the_dict_func, "a{" + signature + "}") if len(toks) == 2: - (func, sig) = toks[1] + func, sig = toks[1] def the_array_func(a_list: Sequence[Any], *, variant=0): """ diff --git a/tests/test_hypothesis.py b/tests/test_hypothesis.py index 6272b80..63ae294 100644 --- a/tests/test_hypothesis.py +++ b/tests/test_hypothesis.py @@ -173,7 +173,7 @@ def test_empty_dict(self, strat): """ Test parsing an empty dict with a valid signature. """ - (key_sig, value_sig) = strat + key_sig, value_sig = strat sig = f"{key_sig}{value_sig}" self.assertEqual(signature(dbus.Dictionary(signature=sig)), "a{" + sig + "}") @@ -197,9 +197,9 @@ def test_parsing(self, strat): Verify that the variant levels always descend within the constructed value. """ - (a_signature, base_type_object) = strat + a_signature, base_type_object = strat - (func, sig_synth) = xformers(a_signature)[0] + func, sig_synth = xformers(a_signature)[0] value = func(base_type_object) sig_orig = dbus.Signature(a_signature) @@ -224,7 +224,7 @@ def test_struct(self, strat): Test exception throwing on a struct signature when number of items is not equal to number of complete types in struct signature. """ - (sig, struct) = strat + sig, struct = strat xform = xformer(sig)