Merge pull request #155 from ericpre/fix_docs_build

Fix docs build caused by pyusid import issue
hyperspy · Aug 18, 2023 · a0a3c20 · a0a3c20
2 parents 9ee2b66 + 4ffedde
commit a0a3c20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pyproject.toml b/pyproject.toml
@@ -51,7 +51,9 @@ blockfile = ["scikit-image>=0.18"]
 mrcz = ["blosc>=1.5", "mrcz>=0.3.6"]
 scalebar_export = ["matplotlib-scalebar", "matplotlib>=3.1.3"]
 tiff = ["tifffile>=2020.2.16", "imagecodecs>=2020.1.31"]
-usid = ["pyUSID"]
+# Add sidpy dependency and pinning as workaround to fix pyUSID import
+# Remove sidpy dependency once https://github.com/pycroscopy/pyUSID/issues/85 is fixed.
+usid = ["pyUSID", "sidpy<=0.12.0"]
 zspy = ["zarr"]
 tests = [
   "pooch",

diff --git a/upcoming_changes/155.maintenance.rst b/upcoming_changes/155.maintenance.rst
@@ -0,0 +1 @@
+Add ``sidpy`` dependency and pin it to <0.12.1 as a workaround to fix pyusid import