diff --git a/setup.py b/setup.py index 6da01ba7b..c2cf3540d 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ def get_package_data(root_dir): tests_require = ['coverage', 'jupyter', 'mypy', 'types-redis', 'types-python-dateutil', 'pytest'] install_requires = [ - 'apscheduler', 'attrs', 'dulwich', 'h5py', 'hickle', 'IPython>=0.1', 'jupyter', 'lmfit', 'matplotlib>=3.0', + 'apscheduler', 'attrs', 'dulwich', 'h5py', 'IPython>=0.1', 'jupyter', 'lmfit', 'matplotlib>=3.0', 'numdifftools', 'numpy>=1.15', 'opencv-python', 'PyQt5', 'pyqtgraph', 'pyvisa', 'pyzmqrpc', 'qcodes>=0.23.0', 'qcodes-contrib-drivers', 'qilib', 'qtpy', 'qupulse', 'redis', 'scipy', 'scikit-image', 'shapely', 'sympy' @@ -45,7 +45,7 @@ def get_package_data(root_dir): install_requires.append('pywin32') rtd_requires = [ - 'sphinx>=1.7', 'sphinx_rtd_theme', 'nbsphinx', 'sphinx-automodapi','sphinx_copybutton' + 'sphinx>=1.7', 'sphinx_rtd_theme', 'nbsphinx', 'sphinx-automodapi', 'sphinx_copybutton' ] extras_require = {"rtd": rtd_requires} @@ -67,6 +67,7 @@ def get_package_data(root_dir): 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', 'Topic :: Scientific/Engineering' ], license='MIT', diff --git a/src/qtt/data.py b/src/qtt/data.py index 6ccd1188f..27da13b3f 100644 --- a/src/qtt/data.py +++ b/src/qtt/data.py @@ -30,7 +30,7 @@ def load_example_dataset(filename: str, verbose: int = 0) -> Optional[DataSet]: Returns: Example dataset or None of no dataset can be found """ - exampledatadir = os.path.join(qtt.__path__[0], 'exampledata') # type: ignore # mypy issue #1422 + exampledatadir = os.path.join(qtt.__path__[0], 'exampledata') # type: ignore # mypy issue #1422 dataset = qtt.data.load_dataset(os.path.join(exampledatadir, filename), verbose=verbose) return dataset @@ -165,8 +165,12 @@ def load_dataset(location, io=None, verbose=0): formatters = [DataSet.default_formatter] from qcodes.data.hdf5_format import HDF5FormatMetadata - from qcodes.data.hdf5_format_hickle import HDF5FormatHickle - formatters += [HDF5FormatHickle(), HDF5FormatMetadata()] + formatters += [HDF5FormatMetadata()] + try: + from qcodes.data.hdf5_format_hickle import HDF5FormatHickle + formatters += [HDF5FormatHickle()] + except ImportError: + logging.info('hickle not available') from qcodes.data.hdf5_format import HDF5Format formatters += [HDF5Format()]