From 4936b04a555b34675d8470c95dfb8c0db435f4fe Mon Sep 17 00:00:00 2001 From: Rachel Baust Date: Thu, 8 Aug 2024 13:25:22 +0100 Subject: [PATCH 1/2] Update orsopy to version 1.2.1 This version fixes a bug with column headers in the .ort ASCII file, requiring updates to our system test reference files. --- .../reference/ISISReducedPeriodDataWorkspaceORSOFile.ort.md5 | 2 +- .../framework/reference/ISISStitchedWorkspaceORSOFile.ort.md5 | 2 +- conda/recipes/conda_build_config.yaml | 2 +- mantid-developer-linux.yml | 2 +- mantid-developer-osx.yml | 2 +- mantid-developer-win.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Testing/SystemTests/tests/framework/reference/ISISReducedPeriodDataWorkspaceORSOFile.ort.md5 b/Testing/SystemTests/tests/framework/reference/ISISReducedPeriodDataWorkspaceORSOFile.ort.md5 index 57fee22bf88b..7d660f25c4a0 100644 --- 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 index fc9bc62194f3..59885268d90d 100644 --- 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 index 9bab00363c86..6f83fa007bb9 100644 --- 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/mantid-developer-linux.yml b/mantid-developer-linux.yml index efad279f4597..766aba429514 100644 --- 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 index de72a0d6c5c4..728765be6499 100644 --- 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 index e6349ea70b82..dacc6f1e7d67 100644 --- 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 From 24ceb9bef68f9cf6dce7d24607666dc644d831a5 Mon Sep 17 00:00:00 2001 From: Rachel Baust Date: Thu, 8 Aug 2024 13:47:17 +0100 Subject: [PATCH 2/2] Add release notes for updating orsopy to version 1.2.1 --- docs/source/release/v6.11.0/Reflectometry/Bugfixes/37769.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/source/release/v6.11.0/Reflectometry/Bugfixes/37769.rst diff --git a/docs/source/release/v6.11.0/Reflectometry/Bugfixes/37769.rst b/docs/source/release/v6.11.0/Reflectometry/Bugfixes/37769.rst new file mode 100644 index 000000000000..fde342b15a3c --- /dev/null +++ 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. \ No newline at end of file