From f07f2d5c561168d3289617f8ea34efc96f17e68e Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenshnielsen@gmail.com>
Date: Sun, 6 Oct 2024 09:14:56 +0200
Subject: [PATCH 01/10] Silence warnings triggered from third party in 3.13

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 1b159648916..8c1d485bd16 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -222,7 +222,8 @@ filterwarnings = [
     'ignore:pkg_resources is deprecated as an API:DeprecationWarning', # pyvisa-sim
     'ignore:open_binary is deprecated:DeprecationWarning', # pyvisa-sim
     'ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning', # tqdm dateutil
-    'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning' # jupyter
+    'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning', # jupyter
+    'ignore:Parsing dates involving a day of month without a year specified is ambiguious' # ipykernel 3.13+
 ]
 
 [tool.ruff]

From 1823371964d36a8cea4b3f42a9713b8466602a9c Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenshnielsen@gmail.com>
Date: Sun, 6 Oct 2024 09:27:06 +0200
Subject: [PATCH 02/10] Silence more warnings

---
 pyproject.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8c1d485bd16..235b2e38cd5 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -223,7 +223,8 @@ filterwarnings = [
     'ignore:open_binary is deprecated:DeprecationWarning', # pyvisa-sim
     'ignore:datetime.datetime.utcfromtimestamp\(\) is deprecated and scheduled for removal in a future version:DeprecationWarning', # tqdm dateutil
     'ignore:Jupyter is migrating its paths to use standard platformdirs:DeprecationWarning', # jupyter
-    'ignore:Parsing dates involving a day of month without a year specified is ambiguious' # ipykernel 3.13+
+    'ignore:Parsing dates involving a day of month without a year specified is ambiguious:DeprecationWarning', # ipykernel 3.13+
+    'ignore:unclosed database in:ResourceWarning' # internal should be fixed
 ]
 
 [tool.ruff]

From 30ff5cd9e1734ab8f059473ada1693625276baff Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Mon, 7 Oct 2024 07:40:51 +0200
Subject: [PATCH 03/10] Try build on 3.13

---
 .github/workflows/docs.yaml   | 4 +++-
 .github/workflows/pytest.yaml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 9d0ac72b093..635a851ea77 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -29,12 +29,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12","3.13.0-rc.3"]
         exclude:
           - os: windows-latest
             python-version: 3.10
           - os: windows-latest
             python-version: 3.11
+          - os: windows-latest
+            python-version: "3.13.0-rc.3"
     env:
       OS: ${{ matrix.os }}
       SPHINX_WARNINGS_AS_ERROR: true
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
index 420febdd135..0e99a673309 100644
--- a/.github/workflows/pytest.yaml
+++ b/.github/workflows/pytest.yaml
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12"]
+        python-version: ["3.10", "3.11", "3.12", "3.13.0-rc.3"]
         min-version: [false]
         include:
           - os: ubuntu-latest
@@ -43,6 +43,8 @@ jobs:
             python-version: "3.11"
           - os: windows-latest
             python-version: "3.12"
+          - os: windows-latest
+            python-version: "3.13.0-rc.3"
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}

From fdada6c4f78e22b5eee37bc9e22ae4006a4db0cb Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Mon, 7 Oct 2024 07:45:22 +0200
Subject: [PATCH 04/10] Remove zhinst since zhinst-core is not available for
 3.13

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 235b2e38cd5..75b61effb0d 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -94,7 +94,7 @@ test = [
     "types-tqdm>=4.64.6",
     "types_pywin32>=305.0.0.7",
     "qcodes_loop>=0.1.1",
-    "zhinst.qcodes>=0.5", # typecheck zhinst driver alias
+    # "zhinst.qcodes>=0.5", # typecheck zhinst driver alias
     "libcst>=1.2.0", # refactor tests
     "jinja2>=3.1.3", # transitive dependency pin due to cve in earlier version
 ]

From 86671267a0c7de5643e7210fd005814cfe716d65 Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Mon, 7 Oct 2024 07:58:54 +0200
Subject: [PATCH 05/10] Disable type check for zhinst

---
 src/qcodes/instrument_drivers/zurich_instruments/hdawg.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/hf2.py   | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/mfli.py  | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/pqsc.py  | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/shfqa.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/shfsg.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/uhfli.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py b/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py
index dea360ecc2f..981757cd168 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import HDAWG
+    from zhinst.qcodes import HDAWG  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/hf2.py b/src/qcodes/instrument_drivers/zurich_instruments/hf2.py
index b2d5affcf6d..f27a46fc11e 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/hf2.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/hf2.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import HF2
+    from zhinst.qcodes import HF2  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/mfli.py b/src/qcodes/instrument_drivers/zurich_instruments/mfli.py
index 5ca70cdec40..9939b1f740b 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/mfli.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/mfli.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import MFLI
+    from zhinst.qcodes import MFLI  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py b/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
index cf15f3fe6f9..4731ce3e6b9 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import PQSC
+    from zhinst.qcodes import PQSC  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py b/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py
index 64095ce3077..50fa173c533 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import SHFQA
+    from zhinst.qcodes import SHFQA  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py b/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py
index 5a4e02c9be5..775614c855c 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import SHFSG
+    from zhinst.qcodes import SHFSG  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py b/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py
index 634c22d9ceb..3a604f55673 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import UHFLI
+    from zhinst.qcodes import UHFLI  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py b/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py
index f9c99ef0e70..5d3fe03ea39 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import UHFQA
+    from zhinst.qcodes import UHFQA  # type: ignore[import-untyped]
 except ImportError:
     raise ImportError(
         """

From e719eba4870b0f6882a8184b60859c563be2a160 Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Mon, 7 Oct 2024 08:01:41 +0200
Subject: [PATCH 06/10] Disable pyarrow until wheel

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 75b61effb0d..f786389bc8e 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,7 +32,7 @@ dependencies = [
     "numpy>=1.22.4",
     "packaging>=20.0",
     "pandas>=1.4.0",
-    "pyarrow>=11.0.0", # will become a requirement of pandas. Installing explicitly silences a warning
+    # "pyarrow>=11.0.0", # will become a requirement of pandas. Installing explicitly silences a warning
     "pyvisa>=1.11.0, <1.15.0",
     "ruamel.yaml>=0.16.0,!=0.16.6",
     "tabulate>=0.9.0",

From b85d6d70f6456d22f9cdf11c1ff3e577f51d14ca Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Mon, 7 Oct 2024 08:06:16 +0200
Subject: [PATCH 07/10] Fix error code

---
 src/qcodes/instrument_drivers/zurich_instruments/hdawg.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/hf2.py   | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/mfli.py  | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/pqsc.py  | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/shfqa.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/shfsg.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/uhfli.py | 2 +-
 src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py b/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py
index 981757cd168..a941995d5ae 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/hdawg.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import HDAWG  # type: ignore[import-untyped]
+    from zhinst.qcodes import HDAWG  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/hf2.py b/src/qcodes/instrument_drivers/zurich_instruments/hf2.py
index f27a46fc11e..afe62ed0e51 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/hf2.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/hf2.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import HF2  # type: ignore[import-untyped]
+    from zhinst.qcodes import HF2  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/mfli.py b/src/qcodes/instrument_drivers/zurich_instruments/mfli.py
index 9939b1f740b..bfc6eb1b4da 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/mfli.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/mfli.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import MFLI  # type: ignore[import-untyped]
+    from zhinst.qcodes import MFLI  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py b/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
index 4731ce3e6b9..aed43bae515 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/pqsc.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import PQSC  # type: ignore[import-untyped]
+    from zhinst.qcodes import PQSC  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py b/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py
index 50fa173c533..f98b50ba688 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/shfqa.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import SHFQA  # type: ignore[import-untyped]
+    from zhinst.qcodes import SHFQA  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py b/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py
index 775614c855c..36416534218 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/shfsg.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import SHFSG  # type: ignore[import-untyped]
+    from zhinst.qcodes import SHFSG  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py b/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py
index 3a604f55673..45df124b500 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/uhfli.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import UHFLI  # type: ignore[import-untyped]
+    from zhinst.qcodes import UHFLI  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """
diff --git a/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py b/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py
index 5d3fe03ea39..d2cc4c045e4 100644
--- a/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py
+++ b/src/qcodes/instrument_drivers/zurich_instruments/uhfqa.py
@@ -5,7 +5,7 @@
 
 
 try:
-    from zhinst.qcodes import UHFQA  # type: ignore[import-untyped]
+    from zhinst.qcodes import UHFQA  # type: ignore[import-not-found]
 except ImportError:
     raise ImportError(
         """

From 69edcc071ebb38149669f0cb4626b053374503f9 Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Wed, 9 Oct 2024 07:47:35 +0200
Subject: [PATCH 08/10] Switch to final release

---
 .github/workflows/docs.yaml   | 4 ++--
 .github/workflows/pytest.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index 635a851ea77..a754bc70f37 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -29,14 +29,14 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12","3.13.0-rc.3"]
+        python-version: ["3.10", "3.11", "3.12","3.13"]
         exclude:
           - os: windows-latest
             python-version: 3.10
           - os: windows-latest
             python-version: 3.11
           - os: windows-latest
-            python-version: "3.13.0-rc.3"
+            python-version: "3.13"
     env:
       OS: ${{ matrix.os }}
       SPHINX_WARNINGS_AS_ERROR: true
diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml
index 0e99a673309..f3e17447ee9 100644
--- a/.github/workflows/pytest.yaml
+++ b/.github/workflows/pytest.yaml
@@ -30,7 +30,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13.0-rc.3"]
+        python-version: ["3.10", "3.11", "3.12", "3.13"]
         min-version: [false]
         include:
           - os: ubuntu-latest
@@ -44,7 +44,7 @@ jobs:
           - os: windows-latest
             python-version: "3.12"
           - os: windows-latest
-            python-version: "3.13.0-rc.3"
+            python-version: "3.13"
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}

From d49396a93678c06ca2cd8407c4e82d52e76329c1 Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Wed, 9 Oct 2024 07:48:11 +0200
Subject: [PATCH 09/10] Mark 3.13 as supported

---
 pyproject.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyproject.toml b/pyproject.toml
index f786389bc8e..d4c64400fc1 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -17,6 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering",
 ]
 license = {text = "MIT"}

From 449c344ca3eaa06c1d73685d4ea97a324b102fb0 Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <jenielse@microsoft.com>
Date: Wed, 9 Oct 2024 08:10:58 +0200
Subject: [PATCH 10/10] Disable parallel docs build

---
 .github/workflows/docs.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
index a754bc70f37..ef2d7bc2a61 100644
--- a/.github/workflows/docs.yaml
+++ b/.github/workflows/docs.yaml
@@ -40,7 +40,8 @@ jobs:
     env:
       OS: ${{ matrix.os }}
       SPHINX_WARNINGS_AS_ERROR: true
-      SPHINX_OPTS: "-v -j 2"
+      # SPHINX_OPTS: "-v -j 2"
+      SPHINX_OPTS: "-v"
     steps:
     - name: Harden Runner
       uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
@@ -52,7 +53,7 @@ jobs:
         fetch-depth: '0'
     - name: set-sphinx-opts
       run: |
-        echo "SPHINX_OPTS=-W -v --keep-going -j 2" >> $GITHUB_ENV
+        echo "SPHINX_OPTS=-W -v --keep-going" >> $GITHUB_ENV
       if: ${{ fromJSON(env.SPHINX_WARNINGS_AS_ERROR) }}
     - name: install pandoc linux
     # add the || true logic to not error in case the index cannot be fetched.