empix 0.0.2__tar.gz → 0.0.4__tar.gz

{empix-0.0.2 → empix-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: empix
-Version: 0.0.2
+Version: 0.0.4
 Summary: Contains tools for analyzing electron microscopy data that are not available in ``hyperspy``.
 Author-email: Matthew Fitzpatrick <matthew.rc.fitzpatrick@gmail.com>
 Project-URL: Homepage, https://mrfitzpa.github.io/empix
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: czekitout
 Requires-Dist: fancytypes>=1.0.0
-Requires-Dist: hyperspy[all]
+Requires-Dist: hyperspy
 Requires-Dist: pyFAI
 Provides-Extra: tests
 Requires-Dist: pytest-cov; extra == "tests"
@@ -38,6 +38,7 @@ Requires-Dist: numpydoc; extra == "docs"
 Requires-Dist: docutils; extra == "docs"
 Provides-Extra: all
 Requires-Dist: empix[docs,examples,tests]; extra == "all"
+Dynamic: license-file
 
 # empix
 

{empix-0.0.2 → empix-0.0.4}/empix/__init__.py

@@ -26,6 +26,10 @@ microscopy data that are not available in `hyperspy
 # For performing deep copies.
 import copy
 
+# For checking whether certain submodules exists and for importing said
+# submodules should they exist.
+import importlib
+
 
 
 # For general array handling.
@@ -47,8 +51,10 @@ import hyperspy.signals
 import hyperspy.axes
 
 # For azimuthally integrating 2D hyperspy signals.
-import pyFAI.detectors
-import pyFAI.azimuthalIntegrator
+detectors = importlib.import_module("pyFAI.detectors")
+integrators = (importlib.import_module("pyFAI.integrator.azimuthal")
+               if importlib.util.find_spec("pyFAI.integrator")
+               else importlib.import_module("pyFAI.azimuthalIntegrator"))
 
 # For downsampling hyperspy signals.
 import skimage.measure
@@ -764,7 +770,11 @@ def _construct_azimuthal_integrator(signal, center):
     v_pixel_size = abs(v_scale)
     L = 10000 * max(v_pixel_size, h_pixel_size)
 
-    AzimuthalIntegrator = pyFAI.azimuthalIntegrator.AzimuthalIntegrator
+    # ``integrators`` is an alias to a pyFAI submodule that was imported near
+    # the top of the current file using the ``importlib.import_module``
+    # function.
+    AzimuthalIntegrator = integrators.AzimuthalIntegrator
+    
     kwargs = {"dist": L,
               "poni1": poni_1,
               "poni2": poni_2,
@@ -779,8 +789,12 @@ def _construct_pyfai_detector(signal):
     h_pixel_size = abs(signal.axes_manager[-2].scale)
     v_pixel_size = abs(signal.axes_manager[-1].scale)
 
+    # ``detectors`` is an alias to a pyFAI submodule that was imported near the
+    # top of the current file using the ``importlib.import_module`` function.
+    Detector = detectors.Detector
+
     kwargs = {"pixel1": v_pixel_size, "pixel2": h_pixel_size}
-    detector = pyFAI.detectors.Detector(**kwargs)
+    detector = Detector(**kwargs)
 
     return detector
 

{empix-0.0.2 → empix-0.0.4}/empix/version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.2'
-__version_tuple__ = version_tuple = (0, 0, 2)
+__version__ = version = '0.0.4'
+__version_tuple__ = version_tuple = (0, 0, 4)

{empix-0.0.2 → empix-0.0.4}/empix.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: empix
-Version: 0.0.2
+Version: 0.0.4
 Summary: Contains tools for analyzing electron microscopy data that are not available in ``hyperspy``.
 Author-email: Matthew Fitzpatrick <matthew.rc.fitzpatrick@gmail.com>
 Project-URL: Homepage, https://mrfitzpa.github.io/empix
@@ -23,7 +23,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: czekitout
 Requires-Dist: fancytypes>=1.0.0
-Requires-Dist: hyperspy[all]
+Requires-Dist: hyperspy
 Requires-Dist: pyFAI
 Provides-Extra: tests
 Requires-Dist: pytest-cov; extra == "tests"
@@ -38,6 +38,7 @@ Requires-Dist: numpydoc; extra == "docs"
 Requires-Dist: docutils; extra == "docs"
 Provides-Extra: all
 Requires-Dist: empix[docs,examples,tests]; extra == "all"
+Dynamic: license-file
 
 # empix
 

{empix-0.0.2 → empix-0.0.4}/empix.egg-info/requires.txt

@@ -1,6 +1,6 @@
 czekitout
 fancytypes>=1.0.0
-hyperspy[all]
+hyperspy
 pyFAI
 
 [all]

{empix-0.0.2 → empix-0.0.4}/pyproject.toml

@@ -39,7 +39,7 @@ keywords = [
 dependencies = [
     "czekitout",
     "fancytypes>=1.0.0",
-    "hyperspy[all]",
+    "hyperspy",
     "pyFAI"
 ]
 requires-python = ">=3.8"