Merge "Be explicit about python3 executable"

This commit is contained in:
Zuul
2019-10-24 09:34:46 +00:00
committed by Gerrit Code Review
10 changed files with 13 additions and 13 deletions

View File

@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/python3
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at

View File

@@ -44,9 +44,9 @@ def get_sdist_name(workdir, repo):
cwd=dest,
)
if use_tox:
python = '.tox/venv/bin/python'
python = '.tox/venv/bin/python3'
else:
python = 'python'
python = 'python3'
# Run it once and discard the result to ensure any setup_requires
# dependencies are installed.
cmd = [python, 'setup.py', '--name']
@@ -77,9 +77,9 @@ def build_sdist(workdir, repo):
cwd=dest,
)
if use_tox:
python = '.tox/venv/bin/python'
python = '.tox/venv/bin/python3'
else:
python = 'python'
python = 'python3'
# Run it once and discard the result to ensure any setup_requires
# dependencies are installed.
cmd = [python, 'setup.py', 'sdist', 'bdist_wheel']

View File

@@ -88,7 +88,7 @@ def get_min_specifier(specifier_set):
def get_requirements_at_ref(workdir, repo, ref):
"Check out the repo at the ref and load the list of requirements."
dest = gitutils.clone_repo(workdir, repo, ref=ref)
processutils.check_call(['python', 'setup.py', 'sdist'], cwd=dest)
processutils.check_call(['python3', 'setup.py', 'sdist'], cwd=dest)
sdist_name = pythonutils.get_sdist_name(workdir, repo)
requirements_filename = os.path.join(
dest, sdist_name + '.egg-info', 'requires.txt',