-
Notifications
You must be signed in to change notification settings - Fork 128
Fix ENGINX data cache search on IDAaaS #38027
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
This change makes sure that the path is built relative to the json index file that was opened. Before, the short name might have been used but the path was being constructed with the long name nonetheless. This fix fixes access to ENGINX files on the data cache.
The path separator on windows is different from the one on linux, so I changed the output path to match the default separator of the OS using make_preferred() and changed unit tests to check this path.
31b4da1
to
8c3758d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code and the newly added test look good.
Does this need a release note before merging? If I'm reading the history right this would have been a problem in 6.10.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just noticed a typo in the release note.
docs/source/release/v6.11.0/Framework/Data_Objects/Bugfixes/38027.rst
Outdated
Show resolved
Hide resolved
Co-authored-by: Caila Finn <47181718+cailafinn@users.noreply.github.com>
Description of work
From the issue described in #37398, the ENGINX files were still not being found in the data cache because part of the path was still using
ENGIN-X
instead ofENGINX
.Summary of work
I changed a few lines of code that ensure that when the shortname of the instrument is used (
ENGINX
) to find the index file, the path is also constructed consistently with this, and uses the shortname version.Access ENGINX files easily on IDAaaS from the data cache.
Fixes #37398 .
Further detail of work
To test:
Test with build number 892.
mantid
python package (workbench not needed) withconda install -c guimacielpereira/label/fix-enginx mantid
python
ENGINX
instead ofENGIN-X
Reviewer
Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Code Review
Functional Tests
Does everything look good? Mark the review as Approve. A member of
@mantidproject/gatekeepers
will take care of it.Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.