Update numpy requirement to 2.2 (typing).

nion-software · Dec 12, 2024 · 99fd0fc · 99fd0fc
1 parent 201f26c
commit 99fd0fc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/meta.yaml b/meta.yaml
@@ -21,6 +21,7 @@ requirements:
     - python >=3.11
     - nionswift >=16.12,<17.0
     - nionui >=8.0,<9.0
+    - numpy >=2.2,<3.0
 
 test:
   imports:

diff --git a/nion/eels_analysis/eels_analysis.py b/nion/eels_analysis/eels_analysis.py
@@ -274,7 +274,7 @@ def subtract_linear_background(data_and_metadata: DataAndMetadata.DataAndMetadat
     p = stacked_fit_linear_background(data[..., range(*fit_range)], signal_index)
     linear = numpy.arange(signal_range[0], signal_range[1])
     background = (p[..., 0, numpy.newaxis] * linear[:] + p[..., 1, numpy.newaxis])
-    result = data[..., range(*signal_range)] - background
+    result: DataAndMetadata._ImageDataType = data[..., range(*signal_range)] - background
 
     return DataAndMetadata.new_data_and_metadata(result, data_and_metadata.intensity_calibration, data_and_metadata.dimensional_calibrations)
 

diff --git a/nionswift_plugin/nion_eels_analysis/ElementalMappingController.py b/nionswift_plugin/nion_eels_analysis/ElementalMappingController.py
@@ -62,7 +62,7 @@ async def pick_new_edge(document_controller: DocumentController.DocumentControll
         - a background subtraction computation with model data item, and edge intervals as inputs
         - a background data item, computed by the background subtraction computation
         - a subtracted data item, computed by the background subtraction computation
-        - a eels line plot with pick, background, and subtracted data items as components
+        - an eels line plot with pick, background, and subtracted data items as components
         - an edge reference, owned by eels line plot, with reference to edge
         - the edge reference is used to recognize the eels line plot as associated with the referenced edge
     """

diff --git a/setup.cfg b/setup.cfg
@@ -18,12 +18,12 @@ classifiers =
 packages = find_namespace:
 python_requires = >=3.11
 install_requires =
-    nionswift>=16.12,<17.0
-    nionui>=8.0,<9.0
+    nionswift >=16.12,<17.0
+    nionui >=8.0,<9.0
+    numpy >=2.2,<3.0
 tests_require =
     nionswift
     nionswift-io
-    numpy>=2.0,<3.0
 
 [options.package_data]
 nion.eels_analysis =