PR: Add validation for custom interpreter option #6354
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dalthviz
changed the title
ccordoba12
reviewed
Feb 1, 2018
spyder/utils/ipython/kernelspec.py
Outdated
| @@ -43,6 +44,9 @@ def argv(self): | |||
| # to the kernel sys.path | |||
| os.environ.pop('VIRTUAL_ENV', None) | |||
| pyexec = CONF.get('main_interpreter', 'executable') | |||
| if not is_python_interpreter(pyexec): | |||
| pyexec = get_python_executable() | |||
| CONF.reset_to_defaults(section='main_interpreter') | |||
There was a problem hiding this comment.
We don't need to reset the entire section. What we need to do is
- Set
'main_interpreter', 'executable'to be empty. - Make
'main_interpreter', 'default'True - Make
'main_interpreter', 'custom'False.
ccordoba12
reviewed
Feb 1, 2018
|
|
||
| # Temporary directory | ||
| TEMPLOCATION = tempfile.gettempdir() | ||
| INTERPRETER = osp.join(TEMPLOCATION, "interpreter") |
There was a problem hiding this comment.
You can use the tmpdir fixture instead of this, like I did here:
https://github.com/spyder-ide/spyder/blob/master/spyder/app/tests/test_mainwindow.py#L216
dalthviz
force-pushed
the
fixes_issue_4958
branch
2 times, most recently
from
09674dd to
eea9347
Compare
dalthviz
force-pushed
the
fixes_issue_4958
branch
from
eea9347 to
52df8d8
Compare
ccordoba12
reviewed
Feb 2, 2018
| def test_python_interpreter(tmpdir): | ||
| """Test the validation of the python interpreter.""" | ||
| # Set a non existing python interpreter | ||
| interpreter = tmpdir.mkdir('interpreter') |
There was a problem hiding this comment.
Let's change this to interpreter = tmpdir.mkdir('interpreter').join("python") to have a more realistic test.
There was a problem hiding this comment.
Also, you need to enclose the statement to the left in a str call to produce a string. So this really needs to be
interpreter = str(tmpdir.mkdir('interpreter').join('python'))
ccordoba12
approved these changes
Feb 3, 2018
ccordoba12
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #4958