Skip to content

Update -2 argument dest to match --python-version. #5578

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Sep 12, 2018
Merged

Update -2 argument dest to match --python-version. #5578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c426585
Update -2 argument dest to match --python-version.
sqwishy Sep 6, 2018
03bbb3b
Add test for #5578
sqwishy Sep 7, 2018
1e56332
Avoid assert raises to test python inference.
sqwishy Sep 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions mypy/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,27 +277,31 @@ def infer_python_version_and_executable(options: Options,
This function mutates options based on special_opts to infer the correct Python version and
executable to use.
"""
# Check Options in case python_version is set in a config file, but prefer command
# line arguments.
python_version = special_opts.python_version or options.python_version

# Infer Python version and/or executable if one is not given

# TODO: (ethanhs) Look at folding these checks and the site packages subprocess calls into
# one subprocess call for speed.
if special_opts.python_executable is not None and special_opts.python_version is not None:
if special_opts.python_executable is not None and python_version is not None:
py_exe_ver = _python_version_from_executable(special_opts.python_executable)
if py_exe_ver != special_opts.python_version:
if py_exe_ver != python_version:
raise PythonExecutableInferenceError(
'Python version {} did not match executable {}, got version {}.'.format(
special_opts.python_version, special_opts.python_executable, py_exe_ver
python_version, special_opts.python_executable, py_exe_ver
))
else:
options.python_version = special_opts.python_version
options.python_version = python_version
options.python_executable = special_opts.python_executable
elif special_opts.python_executable is None and special_opts.python_version is not None:
options.python_version = special_opts.python_version
elif special_opts.python_executable is None and python_version is not None:
options.python_version = python_version
py_exe = None
if not special_opts.no_executable:
py_exe = _python_executable_from_version(special_opts.python_version)
py_exe = _python_executable_from_version(python_version)
options.python_executable = py_exe
elif special_opts.python_version is None and special_opts.python_executable is not None:
elif python_version is None and special_opts.python_executable is not None:
options.python_version = _python_version_from_executable(
special_opts.python_executable)
options.python_executable = special_opts.python_executable
Expand Down Expand Up @@ -454,7 +458,7 @@ def add_invertible_flag(flag: str,
help='Type check code assuming it will be running on Python x.y',
dest='special-opts:python_version')
platform_group.add_argument(
'-2', '--py2', dest='python_version', action='store_const',
'-2', '--py2', dest='special-opts:python_version', action='store_const',
const=defaults.PYTHON2_VERSION,
help="Use Python 2 mode (same as --python-version 2.7)")
platform_group.add_argument(
Expand Down
14 changes: 14 additions & 0 deletions mypy/test/testargs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ def test_executable_inference(self) -> None:
assert str(e.value) == 'Python version (2, 10) did not match executable {}, got' \
' version {}.'.format(sys.executable, sys.version_info[:2])

# If a configuration file specifies python_version, it will be set on options.
# Use that to figure out how to determine a value for python_executable, when
# special_opts.python_version is None.
special_opts = argparse.Namespace()
special_opts.python_executable = None
special_opts.python_version = None
special_opts.no_executable = None
options = Options()
options.python_executable = None
options.python_version = sys.version_info[:2]
infer_python_version_and_executable(options, special_opts)
assert options.python_version == sys.version_info[:2]
assert options.python_executable == sys.executable

# test that --no-site-packages will disable executable inference
matching_version = base + ['--python-version={}'.format(sys_ver_str),
'--no-site-packages']
Expand Down