From d5d32852132f0d04383df4d13e14602d2d5cf5fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ha=CC=8Akon=20Wiik=20A=CC=8Anes?= Date: Sat, 21 Sep 2024 20:50:04 +0200 Subject: [PATCH] Remove more references to kikuchipy.release file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Håkon Wiik Ånes --- kikuchipy/__init__.py | 1 - kikuchipy/_util/tests/test_import.py | 1 - kikuchipy/data/_data.py | 5 ++--- kikuchipy/io/plugins/kikuchipy_h5ebsd.py | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kikuchipy/__init__.py b/kikuchipy/__init__.py index 93cc5094..ff27ee73 100644 --- a/kikuchipy/__init__.py +++ b/kikuchipy/__init__.py @@ -125,7 +125,6 @@ def set_log_level(level: Union[int, str]): # pragma: no cover "io", "load", "pattern", - "release", "set_log_level", "signals", "simulations", diff --git a/kikuchipy/_util/tests/test_import.py b/kikuchipy/_util/tests/test_import.py index f45af423..9a344d6f 100644 --- a/kikuchipy/_util/tests/test_import.py +++ b/kikuchipy/_util/tests/test_import.py @@ -182,7 +182,6 @@ def test_dir(self): "io", "load", "pattern", - "release", "set_log_level", "signals", "simulations", diff --git a/kikuchipy/data/_data.py b/kikuchipy/data/_data.py index aaed08bc..b4bd79d2 100644 --- a/kikuchipy/data/_data.py +++ b/kikuchipy/data/_data.py @@ -22,15 +22,14 @@ import hyperspy.api as hs import pooch -from kikuchipy import load +from kikuchipy import __version__, load from kikuchipy.data._registry import registry_hashes, registry_urls -from kikuchipy.release import version from kikuchipy.signals import EBSD, EBSDMasterPattern marshall = pooch.create( path=pooch.os_cache("kikuchipy"), base_url="", - version=version.replace(".dev", "+"), + version=__version__.replace(".dev", "+"), version_dev="develop", env="KIKUCHIPY_DATA_DIR", registry=registry_hashes, diff --git a/kikuchipy/io/plugins/kikuchipy_h5ebsd.py b/kikuchipy/io/plugins/kikuchipy_h5ebsd.py index d31a7d5e..a2493a40 100644 --- a/kikuchipy/io/plugins/kikuchipy_h5ebsd.py +++ b/kikuchipy/io/plugins/kikuchipy_h5ebsd.py @@ -29,10 +29,10 @@ from orix.crystal_map import CrystalMap from orix.io.plugins.orix_hdf5 import crystalmap2dict, dict2crystalmap +from kikuchipy import __version__ as kikuchipy_version from kikuchipy.detectors import EBSDDetector from kikuchipy.io._util import _get_input_variable from kikuchipy.io.plugins._h5ebsd import H5EBSDReader, _dict2hdf5group, _hdf5group2dict -from kikuchipy.release import version as kikuchipy_version from kikuchipy.signals.util._crystal_map import _xmap_is_compatible_with_signal __all__ = ["file_reader", "file_writer"]