runner.singularity: Explicitly support Apptainer's singularity when checking versions
#343
Conversation
This file contains 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
tsibley
force-pushed
the
trs/apptainer-versions
branch
from
5932e35 to
cb89a34
Compare
… checking versions My intent was (and remains) to try to maintain compatibility with both SingularityCE and Apptainer after the Singularity fork. I didn't realize/recall that Apptainer restarted version numbering when I added this version inspection! It would be most ideal if Apptainer's `singularity` executable reported the equivalent/compatible SingularityCE version, but that's understandably difficult and so I get why it reports the Apptainer version instead. Thanks to @osageorange for raising this issue, testing this patch, and reporting back that it works! As SingularityCE and Apptainer continue to diverge, a more complicated treatment of them may be needed, but for now this should suffice. Resolves <#329>.
tsibley
force-pushed
the
trs/apptainer-versions
branch
from
cb89a34 to
8d8d531
Compare
|
CI was failing type checking for changes in this PR (now fixed) and also for unrelated reasons (fixed in #344). |
victorlin
approved these changes
Jan 11, 2024
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.
My intent was (and remains) to try to maintain compatibility with both SingularityCE and Apptainer after the Singularity fork. I didn't realize/recall that Apptainer restarted version numbering when I added this version inspection!
It would be most ideal if Apptainer's
singularityexecutable reported the equivalent/compatible SingularityCE version, but that's understandably difficult and so I get why it reports the Apptainer version instead.Thanks to @osageorange for raising this issue, testing this patch, and reporting back that it works!
As SingularityCE and Apptainer continue to diverge, a more complicated treatment of them may be needed, but for now this should suffice.
Resolves #329.
Checklist