From 5f6d602bacc10b2729c13a0f2778dd0dc726e66d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 02:01:35 +0000 Subject: [PATCH 1/2] Update mypy requirement from <1.7.0,>=1.1.1 to >=1.1.1,<1.8.0 Updates the requirements on [mypy](https://github.com/python/mypy) to permit the latest version. - [Changelog](https://github.com/python/mypy/blob/master/CHANGELOG.md) - [Commits](https://github.com/python/mypy/compare/v1.1.1...v1.7.0) --- updated-dependencies: - dependency-name: mypy dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3693901ef..97b63bd60 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -mypy>=1.1.1,<1.7.0 +mypy>=1.1.1,<1.8.0 ipython~=8.17.2 From 8235fb63b57280b9b6a4f10ba7e028ac9879a40b Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 14 Nov 2023 07:21:13 +0100 Subject: [PATCH 2/2] fix typecheck with mypy 1.7 --- qcodes_contrib_drivers/drivers/Horiba/Horiba_FHR.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qcodes_contrib_drivers/drivers/Horiba/Horiba_FHR.py b/qcodes_contrib_drivers/drivers/Horiba/Horiba_FHR.py index 7b8d6a52f..df3597edc 100644 --- a/qcodes_contrib_drivers/drivers/Horiba/Horiba_FHR.py +++ b/qcodes_contrib_drivers/drivers/Horiba/Horiba_FHR.py @@ -398,7 +398,7 @@ def __init__( ) } - super().__init__(name, additional_metadata | (metadata or {}), label) + super().__init__(name, additional_metadata | dict(metadata or {}), label) gratings = ChannelList(self, 'gratings', GratingChannel) slits = ChannelList(self, 'slits', SlitChannel)