Reduce duplicate building on CI (plus other CI improvements)#3642
Merged
DrPaulSharp merged 13 commits intoSasView:mainfrom Oct 24, 2025
Merged
Reduce duplicate building on CI (plus other CI improvements)#3642DrPaulSharp merged 13 commits intoSasView:mainfrom
DrPaulSharp merged 13 commits intoSasView:mainfrom
Conversation
f343cb7 to
855dff3
Compare
DrPaulSharp
approved these changes
Oct 24, 2025
Contributor
DrPaulSharp
left a comment
There was a problem hiding this comment.
Looks good to me. I'll merge this now.
8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
This PR capitalises on the work to make sasview wheels and make sure that sasview is platform-independent (pure python) project.
This PR also uncovers (and fixes) a couple of bugs
ubuntu-latestbecause it no longer had the tools to compilepycairo(unfortunately pypi does not have wheels for non-Windows platforms); the necessary build-deps are now included in casepycaironeeds to be built. (I wonder if that should be added to a caching step instead) -- edit: this was already separately found and fixed on therelease_6.1.1branch so I dropped these patches in rebasingpyproject.tomlandbuild_tools/requirements-dev.txt.Recommendsfield, so that is suppressed as is standard for handling build-dependencies; there's also a small win in reducing the belts-and-braces file handling safety inside the container witheatmydata.src.sas.…as an import; fixed in this PRJust for the moment, I've used the AUSAXS downloader to place the AUSAXS library into the source tree; with #3596 merged, we'll run the tests against the installed version rather than the raw checkout, and then the downloader should download into the installed library instead (the relevant code is inget_external_dependencies.pyalready). And of course once #3634 is merged, then the library will be installed via normal dependency handling and that code gets deleted.I think this work is ready to review and merge, however... we're tripping over each other with lots of PRs touching the same files. Some file-conflict-resolution and merging is needed to clear therelease-6.1.1backlog (at least) prior to merging this PR (probably #3596 and #3634 as well), but then there's substantial work required to merge all these.How Has This Been Tested?
CI
Review Checklist:
[if using the editor, use
[x]in place of[ ]to check a box]Documentation (check at least one)
Installers
Licensing (untick if necessary)