From 17eb6ba8c4a6875f713dd7acdc8ea8ca741b3474 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 04:03:45 +0000 Subject: [PATCH 1/3] Bump mypy from 0.982 to 0.990 Bumps [mypy](https://github.com/python/mypy) from 0.982 to 0.990. - [Release notes](https://github.com/python/mypy/releases) - [Commits](https://github.com/python/mypy/compare/v0.982...v0.990) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b8c5695eece..c5d8d08ec4f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -66,7 +66,7 @@ matplotlib-inline~=0.1.6 mistune~=2.0.4 msal~=1.20.0 msal-extensions~=1.0.0 -mypy==0.982 +mypy==0.990 mypy-extensions~=0.4.3 nbclient~=0.7.0 nbconvert~=7.2.2 From 43b08e5fae3fa6e60c5b4fdb928c63f778306c08 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Nov 2022 04:03:57 +0000 Subject: [PATCH 2/3] Bump pywin32 from 304 to 305 Bumps [pywin32](https://github.com/mhammond/pywin32) from 304 to 305. - [Release notes](https://github.com/mhammond/pywin32/releases) - [Changelog](https://github.com/mhammond/pywin32/blob/main/CHANGES.txt) - [Commits](https://github.com/mhammond/pywin32/commits) --- updated-dependencies: - dependency-name: pywin32 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b8c5695eece..bb98b54784e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -115,7 +115,7 @@ python-dateutil~=2.8.2 pytz~=2022.5 PyVISA~=1.12.0 PyVISA-sim~=0.5.1 -pywin32==304; sys_platform == 'win32' +pywin32==305; sys_platform == 'win32' pywinpty~=2.0.8; sys_platform == 'win32' PyYAML~=6.0 pyzmq~=24.0.1 From 01cd41fbace6c1be37e7f3c2a50b66daf1e3bad0 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 8 Nov 2022 07:19:38 +0100 Subject: [PATCH 3/3] Fix invalid override --- qcodes/instrument_drivers/Keysight/Infiniium.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/qcodes/instrument_drivers/Keysight/Infiniium.py b/qcodes/instrument_drivers/Keysight/Infiniium.py index 01c777ed81f..85bdd9e2667 100644 --- a/qcodes/instrument_drivers/Keysight/Infiniium.py +++ b/qcodes/instrument_drivers/Keysight/Infiniium.py @@ -15,6 +15,7 @@ ) from qcodes.parameters import ( Parameter, + ParameterBase, ParameterWithSetpoints, create_on_off_val_mapping, ) @@ -105,7 +106,7 @@ def __init__( self._unit = 0 @property - def setpoints(self) -> Sequence[Parameter]: + def setpoints(self) -> Sequence[ParameterBase]: """ Overwrite setpoint parameter to update setpoints if auto_digitize is true """