qcodes 0.44.0__tar.gz → 0.45.0__tar.gz

{qcodes-0.44.0/src/qcodes.egg-info → qcodes-0.45.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qcodes
-Version: 0.44.0
+Version: 0.45.0
 Summary: Python-based data acquisition framework developed by the Copenhagen / Delft / Sydney / Microsoft quantum computing consortium
 Maintainer-email: QCoDeS Core Developers <qcodes-support@microsoft.com>
 License: MIT
@@ -30,17 +30,16 @@ Requires-Dist: ipykernel>=6.6.0
 Requires-Dist: jsonschema>=4.9.0
 Requires-Dist: matplotlib>=3.3.3
 Requires-Dist: numpy>=1.21.0
-Requires-Dist: opencensus>=0.7.10
-Requires-Dist: opencensus-ext-azure<2.0.0,>=1.0.4
 Requires-Dist: packaging>=20.0
 Requires-Dist: pandas>=1.2.0
+Requires-Dist: pyarrow>=11.0.0
 Requires-Dist: pyvisa<1.15.0,>=1.11.0
 Requires-Dist: ruamel.yaml!=0.16.6,>=0.16.0
 Requires-Dist: tabulate>=0.8.0
 Requires-Dist: typing_extensions>=4.5.0
 Requires-Dist: tqdm>=4.59.0
 Requires-Dist: uncertainties>=3.1.4
-Requires-Dist: versioningit>=2.0.1
+Requires-Dist: versioningit>=2.2.1
 Requires-Dist: websockets>=9.1
 Requires-Dist: wrapt>=1.13.2; python_version < "3.12"
 Requires-Dist: wrapt>=1.16.0; python_version >= "3.12"
@@ -51,7 +50,6 @@ Requires-Dist: dask>=2022.1.0
 Requires-Dist: tornado>=6.3.3
 Requires-Dist: ipython>=8.10.0
 Requires-Dist: pillow>=9.0.0
-Requires-Dist: rsa>=4.7
 Provides-Extra: zurichinstruments
 Requires-Dist: zhinst-qcodes>=0.3; extra == "zurichinstruments"
 Provides-Extra: loop
@@ -85,7 +83,7 @@ Provides-Extra: docs
 Requires-Dist: autodocsumm>=0.2.9; extra == "docs"
 Requires-Dist: nbsphinx>=0.8.9; extra == "docs"
 Requires-Dist: PyVisa-sim>=0.6.0; extra == "docs"
-Requires-Dist: sphinx>=6.2.0; extra == "docs"
+Requires-Dist: sphinx>=7.3.5; extra == "docs"
 Requires-Dist: sphinx-favicon>=1.0; extra == "docs"
 Requires-Dist: sphinx-issues>=3.0.1; extra == "docs"
 Requires-Dist: sphinx-jsonschema>=1.19.1; extra == "docs"
@@ -95,10 +93,13 @@ Requires-Dist: towncrier>=22.8.0; extra == "docs"
 Requires-Dist: scipy>=1.7.0; extra == "docs"
 Requires-Dist: qcodes_loop>=0.1.1; extra == "docs"
 Requires-Dist: jinja2>=3.1.3; extra == "docs"
+Provides-Extra: opencensus
+Requires-Dist: opencensus>=0.7.10; extra == "opencensus"
+Requires-Dist: opencensus-ext-azure<2.0.0,>=1.0.4; extra == "opencensus"
 
 QCoDeS |PyPi| |DOCS| |PyPI python versions| |DOI|
 =================================================
-|Build Status Github| |Build Status Github Docs| |Codacy badge| |OpenSSF|
+|Build Status Github| |Build Status Github Docs| |Ruff| |OpenSSF|
 
 QCoDeS is a Python-based data acquisition framework developed by the
 Copenhagen / Delft / Sydney / Microsoft quantum computing consortium.
@@ -197,12 +198,12 @@ License
 See `License <https://github.com/QCoDeS/Qcodes/tree/main/LICENSE>`__.
 
 .. |Build Status Github| image:: https://github.com/QCoDeS/Qcodes/workflows/Run%20mypy%20and%20pytest/badge.svg
-    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22Run+mypy+and+pytest%22
+    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22Run+mypy+and+pytest%22+branch%3Amain
 .. |Build Status Github Docs| image:: https://github.com/QCoDeS/Qcodes/workflows/build%20docs/badge.svg
-    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22build+docs%22
-.. |Codacy badge| image:: https://api.codacy.com/project/badge/Grade/6c9e0e5712bf4c6285d6f717aa8e84fa
-    :alt: Codacy Badge
-    :target: https://app.codacy.com/manual/qcodes/Qcodes?utm_source=github.com&utm_medium=referral&utm_content=QCoDeS/Qcodes&utm_campaign=Badge_Grade_Settings
+    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22build+docs%22+branch%3Amain
+.. |Ruff|  image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
 .. |PyPi| image:: https://badge.fury.io/py/qcodes.svg
     :target: https://badge.fury.io/py/qcodes
 .. |PyPI python versions| image:: https://img.shields.io/pypi/pyversions/qcodes.svg

{qcodes-0.44.0 → qcodes-0.45.0}/README.rst

@@ -1,6 +1,6 @@
 QCoDeS |PyPi| |DOCS| |PyPI python versions| |DOI|
 =================================================
-|Build Status Github| |Build Status Github Docs| |Codacy badge| |OpenSSF|
+|Build Status Github| |Build Status Github Docs| |Ruff| |OpenSSF|
 
 QCoDeS is a Python-based data acquisition framework developed by the
 Copenhagen / Delft / Sydney / Microsoft quantum computing consortium.
@@ -99,12 +99,12 @@ License
 See `License <https://github.com/QCoDeS/Qcodes/tree/main/LICENSE>`__.
 
 .. |Build Status Github| image:: https://github.com/QCoDeS/Qcodes/workflows/Run%20mypy%20and%20pytest/badge.svg
-    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22Run+mypy+and+pytest%22
+    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22Run+mypy+and+pytest%22+branch%3Amain
 .. |Build Status Github Docs| image:: https://github.com/QCoDeS/Qcodes/workflows/build%20docs/badge.svg
-    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22build+docs%22
-.. |Codacy badge| image:: https://api.codacy.com/project/badge/Grade/6c9e0e5712bf4c6285d6f717aa8e84fa
-    :alt: Codacy Badge
-    :target: https://app.codacy.com/manual/qcodes/Qcodes?utm_source=github.com&utm_medium=referral&utm_content=QCoDeS/Qcodes&utm_campaign=Badge_Grade_Settings
+    :target: https://github.com/QCoDeS/Qcodes/actions?query=workflow%3A%22build+docs%22+branch%3Amain
+.. |Ruff|  image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json
+    :target: https://github.com/astral-sh/ruff
+    :alt: Ruff
 .. |PyPi| image:: https://badge.fury.io/py/qcodes.svg
     :target: https://badge.fury.io/py/qcodes
 .. |PyPI python versions| image:: https://img.shields.io/pypi/pyversions/qcodes.svg

{qcodes-0.44.0 → qcodes-0.45.0}/pyproject.toml

@@ -1,7 +1,7 @@
 [build-system]
 requires = [
     "setuptools >= 68.1.0",
-    "versioningit >= 2.0.1",
+    "versioningit >= 2.2.1",
 ]
 build-backend = 'setuptools.build_meta'
 
@@ -33,17 +33,16 @@ dependencies = [
     "jsonschema>=4.9.0",
     "matplotlib>=3.3.3",
     "numpy>=1.21.0",
-    "opencensus>=0.7.10",
-    "opencensus-ext-azure>=1.0.4, <2.0.0",
     "packaging>=20.0",
     "pandas>=1.2.0",
+    "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.8.0",
     "typing_extensions>=4.5.0",
     "tqdm>=4.59.0",
     "uncertainties>=3.1.4",
-    "versioningit>=2.0.1",
+    "versioningit>=2.2.1",
     "websockets>=9.1",
     "wrapt>=1.13.2; python_version < '3.12'",
     "wrapt>=1.16.0; python_version >= '3.12'",
@@ -57,7 +56,6 @@ dependencies = [
     "tornado>=6.3.3",
     "ipython>=8.10.0",
     "pillow>=9.0.0",
-    "rsa>=4.7",
 ]
 
 dynamic = ["version"]
@@ -106,7 +104,7 @@ docs = [
     "autodocsumm>=0.2.9",
     "nbsphinx>=0.8.9",
     "PyVisa-sim>=0.6.0",
-    "sphinx>=6.2.0",
+    "sphinx>=7.3.5",
     "sphinx-favicon>=1.0",
     "sphinx-issues>=3.0.1",
     "sphinx-jsonschema>=1.19.1",
@@ -117,6 +115,10 @@ docs = [
     "qcodes_loop>=0.1.1", # legacy dataset import examples
     "jinja2>=3.1.3", # transitive dependency pin due to cve in earlier version
 ]
+opencensus = [
+    "opencensus>=0.7.10",
+    "opencensus-ext-azure>=1.0.4, <2.0.0",
+]
 
 [project.scripts]
 qcodes-monitor = "qcodes.monitor.monitor:main"
@@ -206,10 +208,10 @@ ignore = [
     "src/qcodes/instrument_drivers/Harvard/Decadac.py",
     ]
 reportMissingTypeStubs = true
+reportDeprecated = true
 stubPath = "typings/stubs"
-# we would like to move this to at least standard
-# eventually. From 1.1.339 onwards standard is the default
-typeCheckingMode = "basic"
+
+typeCheckingMode = "standard"
 
 [tool.pytest.ini_options]
 minversion = "7.2"
@@ -219,15 +221,22 @@ addopts = "-n auto --dist=loadfile"
 
 markers = "serial"
 
+# we ignore warnings
 # triggered by third party packages
 filterwarnings = [
     'ignore:Deprecated call to `pkg_resources\.declare_namespace:DeprecationWarning',  # google, sphinxcontrib
     '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
 ]
 
 [tool.ruff]
+
+extend-include = ["*.ipynb"]
+extend-exclude = ["typings"]
+
+[tool.ruff.lint]
 # Enable Pyflakes `E` and `F` codes by default.
 # UP pyupgrade
 # PT025 invalid use of pytest fixtures in other fixtures
@@ -235,7 +244,9 @@ filterwarnings = [
 # I isort
 # ISC flake8-implicit-str-concat
 # TID253 banned-module-level-imports
-select = ["E", "F", "PT025", "UP", "RUF010", "RUF012", "RUF200", "I", "G", "ISC", "TID253", "NPY"]
+# W pydocstyle
+# PLx pylint
+select = ["E", "F", "PT025", "UP", "RUF010", "RUF012", "RUF200", "I", "G", "ISC", "TID253", "NPY", "PLE", "PLR", "PLC", "PLW", "W", "D417", "D416", "D410", "D411", "D412", "D405", "D214", "TCH"]
 # darker will fix this as code is
 # reformatted when it is changed.
 # G004 We have a lot of use of f strings in log messages
@@ -243,17 +254,15 @@ select = ["E", "F", "PT025", "UP", "RUF010", "RUF012", "RUF200", "I", "G", "ISC"
 # NPY002 We have a lot of use of the legacy
 # random number generator. Eventually we should port this
 # code.
-ignore = ["E501", "G004", "NPY002"]
-
-extend-include = ["*.ipynb"]
-
-extend-exclude = ["typings"]
+# PLxxxx are pylint lints that generate a fair amount of warnings
+# it may be worth fixing some or these in the future
+ignore = ["E501", "G004", "NPY002", "PLR2004", "PLR0913", "PLR0911", "PLR0912", "PLR0915", "PLW0602", "PLW0603", "PLW2901"]
 
-[tool.ruff.isort]
+[tool.ruff.lint.isort]
 
 known-first-party = ["qcodes"]
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 # deprecated modules left
 # for backwards compatibility
 "src/qcodes/utils/validators.py" = ["F401"]
@@ -291,17 +300,28 @@ known-first-party = ["qcodes"]
 # This triggeres in notebooks even with a md cell at the top
 "*.ipynb" = ["E402"]
 
-# these imports are fine at module level
+# TID253 these imports are fine at module level
 # in tests and examples
+# D417 no need to fix in deprecated module
 "docs/*" = ["TID253"]
-"src/qcodes/tests/*" = ["TID253"]
+"src/qcodes/tests/*" = ["TID253", "D417"]
 "tests/*" = ["TID253"]
 
-[tool.ruff.flake8-tidy-imports]
+[tool.ruff.lint.flake8-tidy-imports]
 # There modules are relatively slow to import
 # and only required in specific places so
 # don't import them at module level
-banned-module-level-imports = ["xarray", "pandas", "opencensus"]
+banned-module-level-imports = ["xarray", "pandas", "opencensus", "tqdm.dask", "dask", "matplotlib", "IPython"]
+
+[tool.ruff.lint.pydocstyle]
+convention = "google"
+
+[tool.ruff.lint.flake8-type-checking]
+quote-annotations = true
+
+[tool.setuptools.cmdclass]
+sdist = "versioningit.cmdclass.sdist"
+build_py = "versioningit.cmdclass.build_py"
 
 [tool.towncrier]
 package = "qcodes"

qcodes-0.45.0/setup.py

@@ -0,0 +1,8 @@
+"""
+This file only exists as a fallback for older versions of pip/setuptools
+All configuration is done in pyproject.toml
+"""
+from setuptools import setup
+
+if __name__ == "__main__":
+    setup()

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/_version.py

@@ -14,4 +14,4 @@ def _get_version() -> str:
         return "0.0"
 
 
-__version__ = "0.44.0"
+__version__ = "0.45.0"

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/calibrations/keithley.py

@@ -3,11 +3,10 @@ from __future__ import annotations
 import time
 from typing import TYPE_CHECKING
 
-from qcodes.instrument import Instrument
-from qcodes.parameters import Parameter
-
 if TYPE_CHECKING:
+    from qcodes.instrument import Instrument
     from qcodes.instrument_drivers.Keithley import Keithley26xx
+    from qcodes.parameters import Parameter
 
 src_FS_map = {
     "200e-3": 180e-3, "2": 1.8, "20": 18, "200": 180,

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/configuration/config.py

@@ -240,7 +240,6 @@ class Config:
             default: default value, stored only in the schema
 
         Examples:
-
             >>> defaults.add("trace_color", "blue", "string", "description")
 
         will update the config:

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/data_export.py

@@ -1,14 +1,17 @@
 from __future__ import annotations
 
 import logging
+from typing import TYPE_CHECKING
 
 import numpy as np
 from typing_extensions import TypedDict
 
-from qcodes.dataset.data_set_protocol import DataSetProtocol
-from qcodes.dataset.descriptions.param_spec import ParamSpecBase
 from qcodes.utils import list_of_data_to_maybe_ragged_nd_array
 
+if TYPE_CHECKING:
+    from qcodes.dataset.data_set_protocol import DataSetProtocol
+    from qcodes.dataset.descriptions.param_spec import ParamSpecBase
+
 log = logging.getLogger(__name__)
 
 
@@ -93,7 +96,7 @@ def _rows_from_datapoints(inputsetpoints: np.ndarray) -> np.ndarray:
     but they can nonetheless be used to identify certain scan types
 
     Args:
-        setpoints: The raw setpoints as a one-dimensional array
+        inputsetpoints: The raw setpoints as a one-dimensional array
 
     Returns:
         A ndarray of the rows

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/data_set.py

@@ -6,7 +6,6 @@ import logging
 import tempfile
 import time
 import uuid
-from collections.abc import Callable, Mapping, Sequence
 from dataclasses import dataclass
 from pathlib import Path
 from queue import Queue
@@ -27,10 +26,8 @@ from qcodes.dataset.data_set_protocol import (
     values_type,
 )
 from qcodes.dataset.descriptions.dependencies import InterDependencies_
-from qcodes.dataset.descriptions.param_spec import ParamSpec, ParamSpecBase
 from qcodes.dataset.descriptions.rundescriber import RunDescriber
 from qcodes.dataset.descriptions.versioning.converters import new_to_old, old_to_new
-from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes
 from qcodes.dataset.descriptions.versioning.v0 import InterDependencies
 from qcodes.dataset.experiment_settings import get_default_experiment_id
 from qcodes.dataset.export_config import (
@@ -100,9 +97,13 @@ from .exporters.export_to_xarray import (
 from .subscriber import _Subscriber
 
 if TYPE_CHECKING:
+    from collections.abc import Callable, Mapping, Sequence
+
     import pandas as pd
     import xarray as xr
 
+    from qcodes.dataset.descriptions.param_spec import ParamSpec, ParamSpecBase
+    from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes
     from qcodes.parameters import ParameterBase
 
 
@@ -749,9 +750,8 @@ class DataSet(BaseDataSet):
                 {'keys': 'finalize', 'values': self.run_id})
             while self.run_id in writer_status.active_datasets:
                 time.sleep(self.background_sleep_time)
-        else:
-            if self.run_id in writer_status.active_datasets:
-                writer_status.active_datasets.remove(self.run_id)
+        elif self.run_id in writer_status.active_datasets:
+            writer_status.active_datasets.remove(self.run_id)
         if len(writer_status.active_datasets) == 0:
             writer_status.write_in_background = None
             if writer_status.bg_writer is not None:
@@ -1029,6 +1029,7 @@ class DataSet(BaseDataSet):
                 If set to "auto" multi index will be used if projecting the data onto
                 a grid requires filling non measured values with NaN  and the shapes
                 of the data has not been set in the run description.
+
         Returns:
             :py:class:`xr.Dataset` with the requested parameter(s) data as
             :py:class:`xr.DataArray` s and coordinates formed by the dependencies.
@@ -1826,6 +1827,7 @@ def new_data_set(
         specs: list of parameters to create this dataset with
         values: the values to associate with the parameters
         metadata: the metadata to associate with the dataset
+        conn: Existing connection to the database.
         in_memory_cache: Should measured data be keep in memory
             and available as part of the `dataset.cache` object.
 

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/data_set_cache.py

@@ -1,15 +1,12 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Mapping
 from pathlib import Path
 from typing import TYPE_CHECKING, Generic, Literal, TypeVar
 
 import numpy as np
 
-from qcodes.dataset.descriptions.rundescriber import RunDescriber
 from qcodes.dataset.exporters.export_info import ExportInfo
-from qcodes.dataset.sqlite.connection import ConnectionPlus
 from qcodes.dataset.sqlite.queries import completed, load_new_data_for_rundescriber
 
 from .exporters.export_to_pandas import (
@@ -22,20 +19,25 @@ from .exporters.export_to_xarray import (
 )
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping
+
     import pandas as pd
     import xarray as xr
 
+    from qcodes.dataset.descriptions.rundescriber import RunDescriber
+    from qcodes.dataset.sqlite.connection import ConnectionPlus
+
     # used in forward refs that cannot be detected
     from .data_set import DataSet  # noqa F401
     from .data_set_in_memory import DataSetInMem
     from .data_set_protocol import DataSetProtocol, ParameterData
 
-DatasetType = TypeVar("DatasetType", bound="DataSetProtocol", covariant=True)
+DatasetType_co = TypeVar("DatasetType_co", bound="DataSetProtocol", covariant=True)
 
 log = logging.getLogger(__name__)
 
 
-class DataSetCache(Generic[DatasetType]):
+class DataSetCache(Generic[DatasetType_co]):
     """
     The DataSetCache contains a in memory representation of the
     data in this dataset as well a a method to progressively read data
@@ -47,7 +49,7 @@ class DataSetCache(Generic[DatasetType]):
     :py:class:`.DataSet.to_pandas_dataframe_dict`
     """
 
-    def __init__(self, dataset: DatasetType):
+    def __init__(self, dataset: DatasetType_co):
         self._dataset = dataset
         self._data: ParameterData = {}
         #: number of rows read per parameter tree (by the name of the dependent parameter)

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/data_set_in_memory.py

@@ -6,7 +6,6 @@ import logging
 import os
 import time
 import warnings
-from collections.abc import Mapping, Sequence
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, Literal
 
@@ -19,10 +18,8 @@ from qcodes.dataset.data_set_protocol import (
     ParameterData,
 )
 from qcodes.dataset.descriptions.dependencies import InterDependencies_
-from qcodes.dataset.descriptions.param_spec import ParamSpec, ParamSpecBase
 from qcodes.dataset.descriptions.rundescriber import RunDescriber
 from qcodes.dataset.descriptions.versioning.converters import new_to_old
-from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes
 from qcodes.dataset.export_config import DataExportType
 from qcodes.dataset.guids import generate_guid
 from qcodes.dataset.linked_datasets.links import Link, links_to_str
@@ -52,9 +49,14 @@ from .exporters.export_info import ExportInfo
 from .linked_datasets.links import str_to_links
 
 if TYPE_CHECKING:
+    from collections.abc import Mapping, Sequence
+
     import pandas as pd
     import xarray as xr
 
+    from qcodes.dataset.descriptions.param_spec import ParamSpec, ParamSpecBase
+    from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes
+
     from ..parameters import ParameterBase
 
 log = logging.getLogger(__name__)
@@ -332,34 +334,23 @@ class DataSetInMem(BaseDataSet):
             export_info=export_info,
             snapshot=run_attributes["snapshot"],
         )
-        xr_path = export_info.export_paths.get("nc")
+        xr_path_temp = export_info.export_paths.get("nc")
+        xr_path = Path(xr_path_temp) if xr_path_temp is not None else None
 
         cls._set_cache_from_netcdf(ds, xr_path)
         return ds
 
     @classmethod
-    def _set_cache_from_netcdf(cls, ds: DataSetInMem, xr_path: str | None) -> bool:
-        import cf_xarray as cfxr
-        import xarray as xr
+    def _set_cache_from_netcdf(cls, ds: DataSetInMem, xr_path: Path | None) -> bool:
 
         success = True
-        if xr_path is not None:
-            try:
-                loaded_data = xr.load_dataset(xr_path, engine="h5netcdf")
-                loaded_data = cfxr.coding.decode_compress_to_multi_index(loaded_data)
-                ds._cache = DataSetCacheInMem(ds)
-                ds._cache._data = cls._from_xarray_dataset_to_qcodes_raw_data(
-                    loaded_data
-                )
-            except (
-                FileNotFoundError,
-                OSError,
-            ):  # older versions of h5py may throw a OSError here
-                success = False
-                warnings.warn(
-                    "Could not load raw data for dataset with guid :"
-                    f"{ds.guid} from location {xr_path}"
-                )
+        if xr_path is not None and xr_path.is_file():
+            ds._cache = DataSetCacheDeferred(ds, xr_path)
+        elif xr_path is not None and not xr_path.is_file():
+            success = False
+            warnings.warn(
+                "Could not load raw data for dataset with guid : {ds.guid} from location {xr_path}"
+            )
         else:
             warnings.warn(f"No raw data stored for dataset with guid : {ds.guid}")
             success = False
@@ -375,12 +366,12 @@ class DataSetInMem(BaseDataSet):
         be able to use this method to update the metadata in the database to refer to
         the new location.
         """
-        if isinstance(path, Path):
-            path = str(path)
+        if isinstance(path, str):
+            path = Path(path)
         data_loaded = self._set_cache_from_netcdf(self, path)
         if data_loaded:
             export_info = self.export_info
-            export_info.export_paths["nc"] = path
+            export_info.export_paths["nc"] = str(path)
             self._set_export_info(export_info)
         else:
             raise FileNotFoundError(f"Could not load a netcdf file from {path}")

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/data_set_info.py

@@ -1,13 +1,11 @@
 from __future__ import annotations
 
 import json
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from typing_extensions import TypedDict
 
-from qcodes.dataset.descriptions.rundescriber import RunDescriber
 from qcodes.dataset.linked_datasets.links import Link, str_to_links
-from qcodes.dataset.sqlite.connection import ConnectionPlus
 from qcodes.dataset.sqlite.queries import (
     ExperimentAttributeDict,
     get_raw_run_attributes,
@@ -16,6 +14,10 @@ from qcodes.dataset.sqlite.queries import (
 
 from .descriptions.versioning import serialization
 
+if TYPE_CHECKING:
+    from qcodes.dataset.descriptions.rundescriber import RunDescriber
+    from qcodes.dataset.sqlite.connection import ConnectionPlus
+
 
 class RunAttributesDict(TypedDict):
     run_id: int

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/data_set_protocol.py

@@ -18,12 +18,9 @@ from typing import (
 )
 
 import numpy as np
-from typing_extensions import TypeAlias
 
 from qcodes.dataset.descriptions.dependencies import InterDependencies_
 from qcodes.dataset.descriptions.param_spec import ParamSpec, ParamSpecBase
-from qcodes.dataset.descriptions.rundescriber import RunDescriber
-from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes
 from qcodes.dataset.export_config import (
     DataExportType,
     get_data_export_name_elements,
@@ -31,10 +28,8 @@ from qcodes.dataset.export_config import (
     get_data_export_prefix,
     get_data_export_type,
 )
-from qcodes.dataset.linked_datasets.links import Link
 
 from .descriptions.versioning.converters import new_to_old
-from .exporters.export_info import ExportInfo
 from .exporters.export_to_csv import dataframe_to_csv
 from .exporters.export_to_xarray import xarray_to_h5netcdf_with_complex_numbers
 from .sqlite.queries import raw_time_to_str_time
@@ -49,10 +44,15 @@ else:
 if TYPE_CHECKING:
     import pandas as pd
     import xarray as xr
+    from typing_extensions import TypeAlias
 
+    from qcodes.dataset.descriptions.rundescriber import RunDescriber
+    from qcodes.dataset.descriptions.versioning.rundescribertypes import Shapes
+    from qcodes.dataset.linked_datasets.links import Link
     from qcodes.parameters import ParameterBase
 
     from .data_set_cache import DataSetCache
+    from .exporters.export_info import ExportInfo
 
 # for unknown reason entrypoints registered in pyproct.toml shows up
 # twice here convert to set to ensure no duplication.
@@ -376,6 +376,7 @@ class BaseDataSet(DataSetProtocol, Protocol):
                 defaults to a value set in qcodes config
             path: Export path, defaults to value set in config
             prefix: File prefix, e.g. ``qcodes_``, defaults to value set in config.
+            automatic_export: Is this export automatic?
 
         Raises:
             ValueError: If the export data type is not specified or unknown,
@@ -431,6 +432,7 @@ class BaseDataSet(DataSetProtocol, Protocol):
             export_type: Data export type, e.g. DataExportType.NETCDF
             path: Export path, defaults to value set in config
             prefix: File prefix, e.g. "qcodes_", defaults to value set in config.
+            automatic_export: Is this export automatic?
 
         Returns:
             str: Path file was saved to, returns None if no file was saved.

{qcodes-0.44.0 → qcodes-0.45.0}/src/qcodes/dataset/database_extract_runs.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import os
-from pathlib import Path
+from typing import TYPE_CHECKING
 from warnings import warn
 
 import numpy as np
@@ -22,6 +22,9 @@ from qcodes.dataset.sqlite.queries import (
     is_run_id_in_database,
 )
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 
 def extract_runs_into_db(
     source_db_path: str | Path,