Skip to content

Commit

Permalink
Merge pull request #155 from ericpre/fix_docs_build
Browse files Browse the repository at this point in the history
Fix docs build caused by pyusid import issue
  • Loading branch information
jlaehne authored Aug 18, 2023
2 parents 9ee2b66 + 4ffedde commit a0a3c20
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
4 changes: 3 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions upcoming_changes/155.maintenance.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add ``sidpy`` dependency and pin it to <0.12.1 as a workaround to fix pyusid import

0 comments on commit a0a3c20

Please sign in to comment.