Skip to content
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

Fix logic in base directory check for macOS #18866

Merged
merged 1 commit into from Feb 22, 2017

Conversation

martyngigg
Copy link
Member

@martyngigg martyngigg commented Feb 15, 2017

Description of work.

Fixes if to return early if tested file path exists in ConfigService when searching for Mantid.properties.

The OSX system tests are currently failing on master because of the error: http://builds.mantidproject.org/job/master_systemtests-osx/

To test:

  • Build a package on macOS and install it
  • Run /Applications/MantidPlot.app/Contents/MacOS/mantidpython --classic
  • import mantid should succeed now

No issue

Does not need to be in the release notes. A regression introduced in #18680.


Reviewer

Please comment on the following (full description):

Code Review
  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards? Is it well structured with small focussed classes/methods/functions?
  • Are there unit/system tests in place? Are the unit tests small and test the a class in isolation?
  • If there are changes in the release notes then do they describe the changes appropriately?
Functional Tests
  • Do changes function as described? Add comments below that describe the tests performed?

  • How do the changes handle unexpected situations, e.g. bad input?

  • Has the relevant documentation been added/updated?

  • Is user-facing documentation written in a user-friendly manner?

  • Has developer documentation been updated if required?

  • Does everything look good? Comment with the ship it emoji but don't merge. A member of @mantidproject/gatekeepers will take care of it.

@martyngigg martyngigg added the High Priority An issue or pull request that if not addressed is severe enough to postponse a release. label Feb 15, 2017
@martyngigg martyngigg added this to the Release 3.10 milestone Feb 15, 2017
Copy link
Contributor

@samueljackson92 samueljackson92 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Checked out the code and built the package. Followed the test instructions and I can now import Mantid successfully. :shipit:

@peterfpeterson peterfpeterson merged commit e00b2a9 into master Feb 22, 2017
@peterfpeterson peterfpeterson deleted the fix-configsvc-mantidpath branch February 22, 2017 13:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
High Priority An issue or pull request that if not addressed is severe enough to postponse a release.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants