Migrate package resource/metadata access to stdlib importlib APIs

openpiv/__init__.py

@@ -1,4 +1,10 @@
-def test():
-    import pytest
-
-    pytest.main()
+from importlib.metadata import version
+
+
+__version__ = version("OpenPIV")
+
+
+def test():
+    import pytest
+
+    pytest.main()

openpiv/piv.py

@@ -2,7 +2,7 @@
 import matplotlib.pyplot as plt
 
 from openpiv import pyprocess, tools, validation, filters
-from importlib_resources import files
+from importlib.resources import files
 
 import matplotlib.animation as animation
 

openpiv/settings.py

@@ -1,7 +1,7 @@
 
 import pathlib
 from dataclasses import dataclass
-from importlib_resources import files
+from importlib.resources import files
 from typing import Optional, Tuple, Union
 import numpy as np
 

openpiv/test/test_package_metadata.py

@@ -0,0 +1,7 @@
+from importlib.metadata import version
+
+import openpiv
+
+
+def test_package_version_matches_metadata():
+    assert openpiv.__version__ == version("OpenPIV")

openpiv/test/test_piv.py

@@ -1,7 +1,7 @@
 """Tests for the piv module"""
 import numpy as np
 import pytest
-from importlib_resources import files
+from importlib.resources import files
 from openpiv import piv, tools
 from openpiv.pyprocess import extended_search_area_piv
 import matplotlib

openpiv/test/test_process.py

@@ -5,7 +5,7 @@
 from skimage import img_as_ubyte
 from scipy.ndimage import shift as shift_img
 # import pkg_resources as pkg
-from importlib_resources import files
+from importlib.resources import files
 from openpiv.pyprocess import extended_search_area_piv as piv
 from openpiv.pyprocess import fft_correlate_images, \
                               correlation_to_displacement

openpiv/test/test_validation.py

@@ -1,7 +1,7 @@
 """ Testing validation functions """
 from typing import Tuple
 import numpy as np
-from importlib_resources import files
+from importlib.resources import files
 import matplotlib.pyplot as plt
 
 from openpiv.pyprocess import extended_search_area_piv as piv

openpiv/test/test_windef.py

@@ -8,7 +8,7 @@
 import pathlib
 import numpy as np
 import warnings
-from importlib_resources import files
+from importlib.resources import files
 from openpiv import windef
 from openpiv.test import test_process
 from openpiv.tools import display_vector_field, display_vector_field_from_arrays, save

openpiv/test/test_windef_coverage.py

@@ -8,7 +8,7 @@
 import tempfile
 import pathlib
 import types
-from importlib_resources import files
+from importlib.resources import files
 
 from openpiv import windef
 from openpiv.settings import PIVSettings

openpiv/test/test_windef_detailed.py

@@ -5,7 +5,7 @@
 import pytest
 import numpy as np
 import pathlib
-from importlib_resources import files
+from importlib.resources import files
 import matplotlib.pyplot as plt
 import tempfile
 import shutil

openpiv/tutorials/masking_tutorial.py

@@ -1,5 +1,5 @@
 import pathlib
-from importlib_resources import files
+from importlib.resources import files
 import numpy as np
 import matplotlib.pyplot as plt
 from openpiv import tools, scaling, pyprocess, validation, filters,preprocess

openpiv/tutorials/tutorial1.py

@@ -1,4 +1,4 @@
-from importlib_resources import files
+from importlib.resources import files
 import numpy as np
 from openpiv import tools, pyprocess, scaling, validation, filters
 

openpiv/tutorials/tutorial2.py

@@ -1,5 +1,5 @@
 """ Tutorial of using window deformation multi-pass """
-from importlib_resources import files
+from importlib.resources import files
 from openpiv import tools, pyprocess, validation, filters
 
 

openpiv/tutorials/windef_tutorial.py

@@ -1,4 +1,4 @@
-from importlib_resources import files
+from importlib.resources import files
 from openpiv import windef
 
 

pyproject.toml

@@ -37,7 +37,6 @@ scikit-image = ">=0.23.0"
 scipy = ">=1.11.0"
 natsort = ">=8.4.0"
 tqdm = ">=4.66.0"
-importlib_resources = ">=5.12.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.4.3"

recipe/meta.yaml

@@ -27,7 +27,6 @@ requirements:
     - scipy
     - natsort
     - tqdm
-    - importlib_resources
     - arm_pyart
 
 test:

setup.py

@@ -25,8 +25,7 @@
         'scikit-image>=0.23.0',
         'scipy>=1.11.0',
         'natsort>=8.4.0',
-        'tqdm>=4.66.0',
-        'importlib_resources>=5.12.0'
+        'tqdm>=4.66.0'
     ],
     extras_require={"tests": ["pytest"]},
     classifiers=[