xenofem/python-zulip-api
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

provisioning: Fix real and venv Python version mixup.

Browse source
This commit is contained in:
derAnfaenger 2017-11-23 17:39:54 +01:00 committed by Tim Abbott
parent a32446f557
commit 819d5f6ebe
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/provision
View file

@ -27,7 +27,12 @@ the Python version this command is executed with."""
options = parser.parse_args() options = parser.parse_args()
base_dir = os.path.abspath(os.path.join(__file__, '..', '..')) base_dir = os.path.abspath(os.path.join(__file__, '..', '..'))
venv_name = 'zulip-api-py{}-venv'.format(sys.version_info.major) py_version_output = subprocess.check_output([options.python_interpreter, '--version'],
stderr=subprocess.STDOUT, universal_newlines=True)
# The output has the format "Python 1.2.3"
py_version_list = py_version_output.split()[1].split('.')
py_version = tuple(int(num) for num in py_version_list)
venv_name = 'zulip-api-py{}-venv'.format(py_version[0])
venv_dir = os.path.join(base_dir, venv_name) venv_dir = os.path.join(base_dir, venv_name)
if not os.path.isdir(venv_dir): if not os.path.isdir(venv_dir):
@ -75,7 +80,7 @@ the Python version this command is executed with."""
.format(os.path.join(base_dir, requirements_filename))) .format(os.path.join(base_dir, requirements_filename)))
install_dependencies('requirements.txt') install_dependencies('requirements.txt')
if sys.version_info > (3, 1): if py_version > (3, 1):
install_dependencies('py3_requirements.txt') install_dependencies('py3_requirements.txt')
else: else:
warnings.warn("Your Python version does not support mypy. `tools/run-mypy` will fail.") warnings.warn("Your Python version does not support mypy. `tools/run-mypy` will fail.")