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.

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

Use max compatible Python interpreter rather than minimum #7048

Closed
wants to merge 3 commits into from
Closed

Use max compatible Python interpreter rather than minimum #7048

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
07a5c30
Catch OSError when checking if interpreter available in tests
Eric-Arellano Jan 9, 2019
35f48db
Choose max interpreter possible rather than minimum
Eric-Arellano Jan 9, 2019
572754f
Also use max interpreter with export.py
Eric-Arellano Jan 9, 2019
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
4 changes: 2 additions & 2 deletions src/python/pants/backend/project_info/tasks/export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,8 +336,8 @@ def iter_transitive_jars(jar_lib):
# across all the python targets in-play.
#
# For now, make our arbitrary historical choice of a default interpreter explicit and use the
# lowest version.
default_interpreter = min(python_interpreter_targets_mapping.keys())
# highest version.
default_interpreter = max(python_interpreter_targets_mapping.keys())

interpreters_info = {}
for interpreter, targets in six.iteritems(python_interpreter_targets_mapping):
Expand Down
4 changes: 2 additions & 2 deletions src/python/pants/backend/python/interpreter_cache.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,8 @@ def select_interpreter_for_targets(self, targets):
'Unable to detect a suitable interpreter for compatibilities: {} '
'(Conflicting targets: {})'.format(' && '.join(sorted(unique_compatibilities_strs)),
', '.join(tgts_by_compatibilities_strs)))
# Return the lowest compatible interpreter.
return min(allowed_interpreters)
# Return the highest compatible interpreter.
return max(allowed_interpreters)

def _interpreter_from_path(self, path, filters=()):
try:
Expand Down
2 changes: 1 addition & 1 deletion tests/python/pants_test/backend/python/interpreter_selection_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def python_interpreter_path(version):
command = ['python{}'.format(version), '-c', 'import sys; print(sys.executable)']
py_path = subprocess.check_output(command).decode('utf-8').strip()
return os.path.realpath(py_path)
except subprocess.CalledProcessError:
except (subprocess.CalledProcessError, OSError):
return None


Expand Down
12 changes: 6 additions & 6 deletions tests/python/pants_test/backend/python/tasks/test_select_interpreter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,14 @@ def _select_interpreter_and_get_version(self, target_roots, should_invalidate=No

def test_interpreter_selection(self):
self.assertIsNone(self._select_interpreter([]))
self.assertEqual('IronPython-2.77.777', self._select_interpreter_and_get_version([self.reqtgt]))
self.assertEqual('IronPython-2.77.777', self._select_interpreter_and_get_version([self.tgt1]))
self.assertEqual('IronPython-2.88.888', self._select_interpreter_and_get_version([self.tgt2]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.reqtgt]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.tgt1]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.tgt2]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.tgt3]))
self.assertEqual('IronPython-2.77.777', self._select_interpreter_and_get_version([self.tgt4]))
self.assertEqual('IronPython-2.88.888', self._select_interpreter_and_get_version([self.tgt20]))
self.assertEqual('IronPython-2.88.888', self._select_interpreter_and_get_version([self.tgt4]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.tgt20]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.tgt30]))
self.assertEqual('IronPython-2.77.777', self._select_interpreter_and_get_version([self.tgt40]))
self.assertEqual('IronPython-2.88.888', self._select_interpreter_and_get_version([self.tgt40]))
self.assertEqual('IronPython-2.99.999', self._select_interpreter_and_get_version([self.tgt2, self.tgt3]))
self.assertEqual('IronPython-2.88.888', self._select_interpreter_and_get_version([self.tgt2, self.tgt4]))

Expand Down