Source venv when resolving VERSION in Makefile#190
Open
jmchilton wants to merge 1 commit intogalaxyproject:mainfrom
Open
Source venv when resolving VERSION in Makefile#190jmchilton wants to merge 1 commit intogalaxyproject:mainfrom
jmchilton wants to merge 1 commit intogalaxyproject:mainfrom
Conversation
Bare python isn't available on macOS (only python3), which broke make release. Prepending IN_VENV puts .venv/bin on PATH so python resolves within the venv that make setup-venv already creates. DEV_RELEASE env assignment moved inside the sourced shell so it doesn't try to prefix the compound if-statement.
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #190 +/- ##
=======================================
Coverage 41.03% 41.03%
=======================================
Files 51 51
Lines 1974 1974
Branches 441 441
=======================================
Hits 810 810
Misses 1047 1047
Partials 117 117
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
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
1 participant
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.
Summary
make releasefailed on macOS because theVERSION?=$(shell ... python ...)line invoked barepython, which isn't on PATH (onlypython3is).$(IN_VENV)sources.venv/bin/activatesopythonresolves inside the dev venv thatmake setup-venvalready creates.DEV_RELEASE=...to sit after theif ... fi;block so the env-var prefix applies to thepythoninvocation instead of clashing with the compound statement.Test plan
make -n commit-versionshowsDEV_RELEASE=0 python scripts/commit_version.py ...with venv sourced first and VERSION resolved correctlymake release VERSION=0.25.0succeeded as a workaround during 0.25.0 release; this fix removes the need for the explicit override