Skip to content

Commit 73d0ec4

Browse files
Copilotalexlib
andcommitted
refactor: switch to stdlib importlib resources and metadata
Co-authored-by: alexlib <747110+alexlib@users.noreply.github.com>
1 parent f0c1ec4 commit 73d0ec4

18 files changed

+32
-38
lines changed

openpiv/__init__.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
1-
def test():
2-
import pytest
3-
4-
pytest.main()
1+
from importlib.metadata import version
2+
3+
4+
__version__ = version("OpenPIV")
5+
6+
7+
def test():
8+
import pytest
9+
10+
pytest.main()

openpiv/piv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import matplotlib.pyplot as plt
33

44
from openpiv import pyprocess, tools, validation, filters
5-
from importlib_resources import files
5+
from importlib.resources import files
66

77
import matplotlib.animation as animation
88

openpiv/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
import pathlib
33
from dataclasses import dataclass
4-
from importlib_resources import files
4+
from importlib.resources import files
55
from typing import Optional, Tuple, Union
66
import numpy as np
77

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from importlib.metadata import version
2+
3+
import openpiv
4+
5+
6+
def test_package_version_matches_metadata():
7+
assert openpiv.__version__ == version("OpenPIV")

openpiv/test/test_piv.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Tests for the piv module"""
22
import numpy as np
33
import pytest
4-
from importlib_resources import files
4+
from importlib.resources import files
55
from openpiv import piv, tools
66
from openpiv.pyprocess import extended_search_area_piv
77
import matplotlib

openpiv/test/test_process.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from skimage import img_as_ubyte
66
from scipy.ndimage import shift as shift_img
77
# import pkg_resources as pkg
8-
from importlib_resources import files
8+
from importlib.resources import files
99
from openpiv.pyprocess import extended_search_area_piv as piv
1010
from openpiv.pyprocess import fft_correlate_images, \
1111
correlation_to_displacement

openpiv/test/test_validation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
""" Testing validation functions """
22
from typing import Tuple
33
import numpy as np
4-
from importlib_resources import files
4+
from importlib.resources import files
55
import matplotlib.pyplot as plt
66

77
from openpiv.pyprocess import extended_search_area_piv as piv

openpiv/test/test_windef.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import pathlib
99
import numpy as np
1010
import warnings
11-
from importlib_resources import files
11+
from importlib.resources import files
1212
from openpiv import windef
1313
from openpiv.test import test_process
1414
from openpiv.tools import display_vector_field, display_vector_field_from_arrays, save

openpiv/test/test_windef_coverage.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import tempfile
99
import pathlib
1010
import types
11-
from importlib_resources import files
11+
from importlib.resources import files
1212

1313
from openpiv import windef
1414
from openpiv.settings import PIVSettings

openpiv/test/test_windef_detailed.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import pytest
66
import numpy as np
77
import pathlib
8-
from importlib_resources import files
8+
from importlib.resources import files
99
import matplotlib.pyplot as plt
1010
import tempfile
1111
import shutil

0 commit comments

Comments
 (0)