-
Notifications
You must be signed in to change notification settings - Fork 121
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
hooks: update scikit-image hooks for compatibility with v0.20.0
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`.
- Loading branch information
Showing
5 changed files
with
65 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
Update ``scikit-image`` hooks for compatibility with the 0.20.x series; | ||
account for switch to ``lazy_module`` in ``skimage.data`` and | ||
``skimage.filters`` as well as in main package. Collect new data files | ||
that are now required by ``skimage.morphology``. |
19 changes: 19 additions & 0 deletions
19
src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-skimage.data.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
# ------------------------------------------------------------------ | ||
# Copyright (c) 2023 PyInstaller Development Team. | ||
# | ||
# This file is distributed under the terms of the GNU General Public | ||
# License (version 2.0 or later). | ||
# | ||
# The full license is available in LICENSE.GPL.txt, distributed with | ||
# this software. | ||
# | ||
# SPDX-License-Identifier: GPL-2.0-or-later | ||
# ------------------------------------------------------------------ | ||
|
||
from PyInstaller.utils.hooks import is_module_satisfies, collect_data_files, collect_submodules | ||
|
||
# As of scikit-image 0.20.0, we need to collect the __init__.pyi file for `lazy_loader`, as well as collect submodules | ||
# due to lazy loading. | ||
if is_module_satisfies('scikit-image >= 0.20.0'): | ||
datas = collect_data_files("skimage.data", includes=["*.pyi"]) | ||
hiddenimports = collect_submodules('skimage.data', filter=lambda name: name != 'skimage.data.tests') |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-skimage.morphology.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# ------------------------------------------------------------------ | ||
# Copyright (c) 2023 PyInstaller Development Team. | ||
# | ||
# This file is distributed under the terms of the GNU General Public | ||
# License (version 2.0 or later). | ||
# | ||
# The full license is available in LICENSE.GPL.txt, distributed with | ||
# this software. | ||
# | ||
# SPDX-License-Identifier: GPL-2.0-or-later | ||
# ------------------------------------------------------------------ | ||
|
||
from PyInstaller.utils.hooks import collect_data_files, is_module_satisfies | ||
|
||
# As of scikit-image 0.20.0, we need to collect .npy data files for `skimage.morphology` | ||
if is_module_satisfies('scikit-image >= 0.20'): | ||
datas = collect_data_files("skimage.morphology", includes=["*.npy"]) |
17 changes: 17 additions & 0 deletions
17
src/_pyinstaller_hooks_contrib/hooks/stdhooks/hook-skimage.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# ------------------------------------------------------------------ | ||
# Copyright (c) 2023 PyInstaller Development Team. | ||
# | ||
# This file is distributed under the terms of the GNU General Public | ||
# License (version 2.0 or later). | ||
# | ||
# The full license is available in LICENSE.GPL.txt, distributed with | ||
# this software. | ||
# | ||
# SPDX-License-Identifier: GPL-2.0-or-later | ||
# ------------------------------------------------------------------ | ||
|
||
from PyInstaller.utils.hooks import collect_data_files, is_module_satisfies | ||
|
||
# As of scikit-image 0.20.0, we need to collect the __init__.pyi file for `lazy_loader`. | ||
if is_module_satisfies('scikit-image >= 0.20.0'): | ||
datas = collect_data_files("skimage", includes=["*.pyi"]) |