From 241536382cc2694e555a7cbda43ec49218708b45 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 May 2026 09:50:22 +0000 Subject: [PATCH 1/3] Bump types-networkx from 3.6.1.20260508 to 3.6.1.20260512 Bumps [types-networkx](https://github.com/python/typeshed) from 3.6.1.20260508 to 3.6.1.20260512. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-networkx dependency-version: 3.6.1.20260512 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9096578226b..b83287c8b60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -456,7 +456,7 @@ traitlets==5.15.0 # nbsphinx types-jsonschema==4.26.0.20260508 # via qcodes (pyproject.toml) -types-networkx==3.6.1.20260508 +types-networkx==3.6.1.20260512 # via qcodes (pyproject.toml) types-pywin32==311.0.0.20260508 # via qcodes (pyproject.toml) From 2684b1feeba37eac60eba898bb82150265d329f6 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 12 May 2026 21:57:31 +0200 Subject: [PATCH 2/3] Add support for latest types-networkx --- pyproject.toml | 2 +- src/qcodes/dataset/descriptions/dependencies.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index f594c5d541c..d350ef8b96c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -79,7 +79,7 @@ test = [ "PyVisa-sim>=0.6.0", "sphinx>=4.5.0", # sphinx extension tests "types-jsonschema>=4.16.0", - "types-networkx >= 3.6.1.20260303", # minimum version required for correct edge_subgraph types + "types-networkx >= 3.6.1.20260512", # minimum version required for generic data types in graph "types_requests>=0.1.8", "types-tabulate>=0.1.0", "types-tqdm>=4.64.6", diff --git a/src/qcodes/dataset/descriptions/dependencies.py b/src/qcodes/dataset/descriptions/dependencies.py index 43c374c5703..a88a96b736f 100644 --- a/src/qcodes/dataset/descriptions/dependencies.py +++ b/src/qcodes/dataset/descriptions/dependencies.py @@ -53,7 +53,7 @@ def __init__( inferences: ParamSpecTree | None = None, standalones: tuple[ParamSpecBase, ...] = (), ): - self._graph: nx.DiGraph[str] = nx.DiGraph() + self._graph: nx.DiGraph[str, dict[str, ParamSpecBase]] = nx.DiGraph() self.add_dependencies(dependencies) self.add_inferences(inferences) self.add_standalones(standalones) @@ -260,7 +260,9 @@ def paramspecs(self) -> tuple[ParamSpecBase, ...]: """ Return the ParamSpecBase objects of this instance """ - return tuple(paramspec for _, paramspec in self.graph.nodes(data="value")) + return tuple( + paramspec_dict["value"] for _, paramspec_dict in self.graph.nodes(data=True) + ) @property def top_level_parameters(self) -> tuple[ParamSpecBase, ...]: @@ -355,7 +357,7 @@ def __getitem__(self, name: str) -> ParamSpecBase: return self._node_to_paramspec(name) @property - def graph(self) -> nx.DiGraph[str]: + def graph(self) -> nx.DiGraph[str, dict[str, ParamSpecBase]]: return self._graph def to_ipycytoscape_json(self) -> dict[str, list[dict[str, Any]]]: From 6a7d2707aefc3a01e341d66b89808368e82d3d7c Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 12 May 2026 22:20:17 +0200 Subject: [PATCH 3/3] add type for edge --- src/qcodes/dataset/descriptions/dependencies.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qcodes/dataset/descriptions/dependencies.py b/src/qcodes/dataset/descriptions/dependencies.py index a88a96b736f..35be8cb3600 100644 --- a/src/qcodes/dataset/descriptions/dependencies.py +++ b/src/qcodes/dataset/descriptions/dependencies.py @@ -53,7 +53,9 @@ def __init__( inferences: ParamSpecTree | None = None, standalones: tuple[ParamSpecBase, ...] = (), ): - self._graph: nx.DiGraph[str, dict[str, ParamSpecBase]] = nx.DiGraph() + self._graph: nx.DiGraph[str, dict[str, ParamSpecBase], dict[str, str]] = ( + nx.DiGraph() + ) self.add_dependencies(dependencies) self.add_inferences(inferences) self.add_standalones(standalones) @@ -357,7 +359,7 @@ def __getitem__(self, name: str) -> ParamSpecBase: return self._node_to_paramspec(name) @property - def graph(self) -> nx.DiGraph[str, dict[str, ParamSpecBase]]: + def graph(self) -> nx.DiGraph[str, dict[str, ParamSpecBase], dict[str, str]]: return self._graph def to_ipycytoscape_json(self) -> dict[str, list[dict[str, Any]]]: