From 1565d834d2c576bce5fa5780e446891fc932870c Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Sat, 13 Dec 2025 07:18:05 +0100 Subject: [PATCH 1/2] Add missing generic arg --- src/qcodes/parameters/parameter_base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qcodes/parameters/parameter_base.py b/src/qcodes/parameters/parameter_base.py index baba76c77fd2..ecf02fd4a22b 100644 --- a/src/qcodes/parameters/parameter_base.py +++ b/src/qcodes/parameters/parameter_base.py @@ -1317,7 +1317,7 @@ def __call__(self) -> ParamDataType: # Does not implement __hash__, not clear it needs to -class ParameterSet(MutableSet, Generic[P]): # noqa: PLW1641 +class ParameterSet(MutableSet[P], Generic[P]): # noqa: PLW1641 """A set-like container that preserves the insertion order of its parameters. This class implements the common set interface methods while maintaining @@ -1343,7 +1343,7 @@ def discard(self, value: P) -> None: def clear(self) -> None: self._dict.clear() - def pop(self) -> ParameterBase: + def pop(self) -> P: if not self._dict: raise KeyError("pop from an empty ParameterSet") item = next(iter(self._dict)) From eb56b9c37fc5a69296d5927f9dc36e6c756010b2 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Thu, 11 Dec 2025 08:21:42 +0100 Subject: [PATCH 2/2] remove unused type ignore --- src/qcodes/logger/instrument_logger.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/qcodes/logger/instrument_logger.py b/src/qcodes/logger/instrument_logger.py index 7e58a064136d..bb96129a6a56 100644 --- a/src/qcodes/logger/instrument_logger.py +++ b/src/qcodes/logger/instrument_logger.py @@ -85,11 +85,7 @@ def process( full_name = getattr(inst, "full_name", None) instr_type = str(type(inst).__name__) - # merge_extra is a bool attribute in 3.13 and later - # but not included in the typestub see - # https://github.com/python/typeshed/pull/14197 - # this makes it a type checking error in 3.13 but not in earlier versions - if self.merge_extra and "extra" in kwargs: # type: ignore[attr-defined,unused-ignore] + if self.merge_extra and "extra" in kwargs: kwargs["extra"] = {**extra, **kwargs["extra"]} else: kwargs["extra"] = extra