From 87d8c7f074f74b8282f096b4b0ca918f42fc8c5d Mon Sep 17 00:00:00 2001 From: Ian Wahbe Date: Fri, 19 Nov 2021 15:21:13 -0800 Subject: [PATCH] [sdk/pthon] Version Check: Handle virtual env correctly (#8465) * Handle virtual env correctly * Add CHANGELOG entry * Correctly display which version is EOL --- CHANGELOG_PENDING.md | 5 ++++- sdk/python/cmd/pulumi-language-python/main.go | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md index 50d593e92..19fc4a4bb 100644 --- a/CHANGELOG_PENDING.md +++ b/CHANGELOG_PENDING.md @@ -21,5 +21,8 @@ - [codegen/typescript] - Respect default values in Pulumi object types. [#8400](https://github.com/pulumi/pulumi/pull/8400) -- [cli] - Catch expected errors in filestate backend stacks. +- [sdk/python] - Correctly handle version checking python virtual environments. + [#8465](https://github.com/pulumi/pulumi/pull/8465) + +- [cli] - Catch expected errors in stacks with filestate backends. [#8455](https://github.com/pulumi/pulumi/pull/8455) diff --git a/sdk/python/cmd/pulumi-language-python/main.go b/sdk/python/cmd/pulumi-language-python/main.go index cdd463e45..bde9bfe95 100644 --- a/sdk/python/cmd/pulumi-language-python/main.go +++ b/sdk/python/cmd/pulumi-language-python/main.go @@ -678,7 +678,7 @@ func validateVersion(virtualEnvPath string) { var versionCmd *exec.Cmd var err error versionArgs := []string{"--version"} - if virtualEnvPath == "" { + if virtualEnvPath != "" { versionCmd = python.VirtualEnvCommand(virtualEnvPath, "python", versionArgs...) } else if versionCmd, err = python.Command(versionArgs...); err != nil { fmt.Fprintf(os.Stderr, "Failed to find python executable\n") @@ -701,6 +701,6 @@ func validateVersion(virtualEnvPath string) { } else if parsed.LT(eolPythonVersion) { fmt.Fprintf(os.Stderr, "Python %d.%d is approaching EOL and will not be supported in Pulumi soon."+ " Check %s for more details\n", parsed.Major, - eolPythonVersion.Minor, eolPythonVersionIssue) + parsed.Minor, eolPythonVersionIssue) } }