fix: get pipenv py version from Pipfile #7254
Merged
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
cjihrig
approved these changes
May 5, 2021
| @@ -13,8 +14,7 @@ export async function getPipenvDir(srcRoot: string): Promise<string> { | |||
| throw new Error(`Could not find 'python3' or 'python' executable in the PATH.`); | |||
| } | |||
|
|
|||
| const pyVersion = await execAsStringPromise(`${pyBinary} --version`); | |||
| let pipEnvPath = path.join(pipEnvDir, 'lib', 'python' + majMinPyVersion(pyVersion), 'site-packages'); | |||
| let pipEnvPath = path.join(pipEnvDir, 'lib', `python${getPipfilePyVersion(path.join(srcRoot, 'Pipfile'))}`, 'site-packages'); | |||
There was a problem hiding this comment.
Would there be any benefit to falling back to majMinPyVersion() if getPipfilePyVersion() fails?
There was a problem hiding this comment.
If there's no version specified in the Pipfile, creating the virtual env wont even work so I don't think we need a fallback here
4 tasks
|
👋 Hi, this pull request was referenced in the v4.51.0 release! Check out the release notes here https://github.com/aws-amplify/amplify-cli/releases/tag/v4.51.0. |
github-actions
bot
added
the
referenced-in-release
cjihrig
pushed a commit
to ctjlewis/amplify-cli
that referenced
this pull request
Jul 12, 2021
When resolving the virtual env site packages file, the path was constructed using the system python version rather than the virtual env python version. This change constructs the path by parsing the PIpenv file and using the python version found there
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 of changes
When resolving the virtual env site packages file, the path was constructed using the system python version rather than the virtual env python version. This change constructs the path by parsing the PIpenv file and using the python version found there
Issue #, if available
#7188
Description of how you validated changes
Manually tested. Existing E2E tests cover creating building and packaging python functions
Checklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.