Merge pull request mantidproject#38561 from ajjackson/abins-scipy-con…

…stants Revert scipy pin, update Abins test
peterfpeterson · Jan 7, 2025 · 0b6966e · 0b6966e
2 parents bd91124 + 810a319
commit 0b6966e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Testing/Data/UnitTest/Si2-sc_CalculatePowder_powder.txt.md5 b/Testing/Data/UnitTest/Si2-sc_CalculatePowder_powder.txt.md5
@@ -1 +1 @@
-e214ebd3ca915c40032dc03ad2f17ab1
+83715b7b2eeb2d7084f1087450fa239e
diff --git a/Testing/Data/UnitTest/benzene_CalculatePowder_powder.txt.md5 b/Testing/Data/UnitTest/benzene_CalculatePowder_powder.txt.md5
@@ -1 +1 @@
-2d6a4cb6236d56c1d52d4160bed31b0f
+276c6ca0a7eaf70c58b38959296a6ade
diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml
@@ -97,7 +97,7 @@ sphinx_bootstrap_theme:
   - 0.8.1
 
 scipy:
-  - '>=1.10.0,<1.15.0'
+  - '>=1.10.0'
 
 pip:
   - '>=21.0.1'

diff --git a/scripts/test/Abins/AbinsPowderCalculatorTest.py b/scripts/test/Abins/AbinsPowderCalculatorTest.py
@@ -58,7 +58,7 @@ def _good_case(self, name=None):
         for key in ref_data["powder"]:
             for i in ref_data["powder"][key]:
                 try:
-                    assert_allclose(ref_data["powder"][key][i], calculated_data[key][i])
+                    assert_allclose(ref_data["powder"][key][i], calculated_data[key][i], atol=1e-12)
                 except AssertionError as e:
                     raise AssertionError(f"Difference in field '{key}' for case {name}") from e
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		e214ebd3ca915c40032dc03ad2f17ab1
		83715b7b2eeb2d7084f1087450fa239e
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		2d6a4cb6236d56c1d52d4160bed31b0f
		276c6ca0a7eaf70c58b38959296a6ade
-Original file line number
+Diff line change
@@ Expand Up / @@ -97,7 +97,7 @@ sphinx_bootstrap_theme: @@
       - 0.8.1
     scipy:
-      - '>=1.10.0,<1.15.0'
+      - '>=1.10.0'
     pip:
       - '>=21.0.1'
@@ Expand Down @@