Merge pull request #37871 from peterfpeterson/dev_conda_changes

Changes from main into ornl-next
mantidproject · Aug 23, 2024 · 4056363 · 4056363
2 parents a0e61b1 + 24ceb9b
commit 4056363
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/Testing/SystemTests/tests/framework/reference/ISISReducedPeriodDataWorkspaceORSOFile.ort.md5 b/Testing/SystemTests/tests/framework/reference/ISISReducedPeriodDataWorkspaceORSOFile.ort.md5
@@ -1 +1 @@
-4a1cef16108062d75de9a89eeba3bb4b
+de95ca11fc9fc2d82906fe92e5b5a5df
diff --git a/Testing/SystemTests/tests/framework/reference/ISISStitchedWorkspaceORSOFile.ort.md5 b/Testing/SystemTests/tests/framework/reference/ISISStitchedWorkspaceORSOFile.ort.md5
@@ -1 +1 @@
-b10bcf174efb5340c44d34b730ee3f41
+72cfcb05294bedaf07d4709ce10b652b
diff --git a/conda/recipes/conda_build_config.yaml b/conda/recipes/conda_build_config.yaml
@@ -52,7 +52,7 @@ occt:
 
 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
 orsopy:
-  - 1.2.0
+  - 1.2.1
 
 # 1.12.2 introduced an unguarded #define NOMINMAX which causes a compiler warning.
 # It's resolved on their devel branch but not yet included in a release, as of 1.12.5.

diff --git a/docs/source/release/v6.11.0/Reflectometry/Bugfixes/37769.rst b/docs/source/release/v6.11.0/Reflectometry/Bugfixes/37769.rst
@@ -0,0 +1 @@
+- The orsopy library has been updated to version 1.2.1. This pulls in a bug fix where multi-dataset reduced reflectivity .ort files with different column headers for different datasets would use only the headers for the first dataset throughout the file.
diff --git a/mantid-developer-linux.yml b/mantid-developer-linux.yml
@@ -50,7 +50,7 @@ dependencies:
   - toml>=0.10.2
   - versioningit>=2.1
   - joblib
-  - orsopy==1.2.0 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
+  - orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
 
   # Not Windows, OpenGL implementation:
   - mesa-libgl-devel-cos7-x86_64>=18.3.4

diff --git a/mantid-developer-osx.yml b/mantid-developer-osx.yml
@@ -48,7 +48,7 @@ dependencies:
   - toml>=0.10.2
   - versioningit>=2.1
   - joblib
-  - orsopy==1.2.0 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
+  - orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
 
   # Needed only for development
   - black  # may be out of sync with pre-commit

diff --git a/mantid-developer-win.yml b/mantid-developer-win.yml
@@ -47,7 +47,7 @@ dependencies:
   - toml>=0.10.2
   - versioningit>=2.1
   - joblib
-  - orsopy==1.2.0 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
+  - orsopy==1.2.1 # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
   # Needed only for development
   - black  # may be out of sync with pre-commit
   - cppcheck==2.14.2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		4a1cef16108062d75de9a89eeba3bb4b
		de95ca11fc9fc2d82906fe92e5b5a5df
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b10bcf174efb5340c44d34b730ee3f41
		72cfcb05294bedaf07d4709ce10b652b
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,7 +52,7 @@ occt: @@
     # Fix the version to avoid updates being pulled in automatically, which might change the Reflectometry ORSO file content or layout and cause tests to fail.
     orsopy:
-      - 1.2.0
+      - 1.2.1
     # 1.12.2 introduced an unguarded #define NOMINMAX which causes a compiler warning.
     # It's resolved on their devel branch but not yet included in a release, as of 1.12.5.
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- The orsopy library has been updated to version 1.2.1. This pulls in a bug fix where multi-dataset reduced reflectivity .ort files with different column headers for different datasets would use only the headers for the first dataset throughout the file.