Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

hooks: update scikit-image hooks for compatibility with 0.19.x and 0.20.0 #566

Merged
merged 4 commits into from
Mar 31, 2023

Conversation

rokm
Copy link
Member

@rokm rokm commented Mar 31, 2023

Update scikit-image hooks for compatibility with 0.19.x and 0.20.0. The 0.19.x series introduced custom lazy module loader, which in our case affects skimage.filters. In 0.20.0, they switched to lazy_loader, which requires us to collect __init__.pyi files. In addition skimage.morphology introduced two mandatory .npy data files that it tries to load at import.

Supersedes and closes #565.

@rokm rokm force-pushed the hooks-scikit-image-update branch from 7cb895a to 5d355b4 Compare March 31, 2023 16:07
@rokm
Copy link
Member Author

rokm commented Mar 31, 2023

Oneshot test: https://github.com/rokm/pyinstaller-hooks-contrib/actions/runs/4577015129

(@bwoodsend any plans for merging your oneshot branch to the repo?)

rokm added 4 commits April 1, 2023 00:27
Update the `skimage.filters` hook to account for the lazy module
loading within this module.
Account for introducion of the `lazy_loader` in the main package
and in `skimage.data` and `skimage.filters`; collect the
`__init__.pyi` files (required by `lazy_loader`), and collect
submodules where necessary.

Also collect the data files that are now required by `skimage.morphology`.
The `skimage.viewer` module was removed in scikit-image 0.20.0,
so remove the test.
@rokm rokm force-pushed the hooks-scikit-image-update branch from 5d355b4 to 5dfaacd Compare March 31, 2023 22:28
@rokm rokm merged commit 43c1eb1 into pyinstaller:master Mar 31, 2023
@rokm rokm deleted the hooks-scikit-image-update branch March 31, 2023 23:30
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants