Update setuptools and fix m1 mac dev build #35832
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of work
This PR enables the update of
setuptools
within the mantid developer environments. It also fixes an issue which was causing thebuild and test
portion of the PR/package build pipeline to fail on our M1 macs.Following this PR, 4 unit tests still fail when ran on M1 macs. These tests will be fixed in a subsequent PR.
SUB_DIR
variable when creating a mantid developer env on M1 macs to ensure anx64/86 build
takes place.cmake
code that circumvents the fact that recent versions ofsetuptools
do not make use ofegg-link
files.To test:
Successful build on M1 macs will be fully tested once the failing unit tests are fixed in the subsequent PR.
On Windows check that you can launch a debug build in Visual Studio:
mamba env update -f mantid-developer-win.yml --prune
(this will update your setuptools)mantid-developer
environmentcmake --preset=win-vs-2019
depending on which VS version you're usingvisual-studio.bat
that was generated in the build folderOn Linux
Fixes #33118
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.