Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Py3 failures when installing MSVC dependencies #27003

Merged
merged 1 commit into from Jun 20, 2020
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

@@ -271,7 +271,8 @@ def check_cmake(version):
cmake_path = find_executable("cmake")
if cmake_path:
cmake = subprocess.Popen([cmake_path, "--version"], stdout=PIPE)
cmake_version = cmake.stdout.read().splitlines()[0].replace("cmake version ", "")
cmake_version_output = six.ensure_str(cmake.stdout.read()).splitlines()[0]
cmake_version = cmake_version_output.replace("cmake version ", "")
if LooseVersion(cmake_version) >= LooseVersion(version):
return True
return False
@@ -216,7 +216,7 @@ def is_linux():
def append_to_path_env(string, env, name):
variable = ""
if name in env:
variable = env[name]
variable = six.ensure_str(env[name])
if len(variable) > 0:
variable += os.pathsep
variable += string
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.