Skip to content

Fix VIRTUALENV_PYTHON environment lookup #1998

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
gaborbernat merged 5 commits into from
Oct 28, 2020
Merged

Fix VIRTUALENV_PYTHON environment lookup #1998

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c3e4e2
Fix `VIRTUALENV_PYTHON` environment lookup
pneff Oct 28, 2020
e0351cd
Add changelog entry
pneff Oct 28, 2020
3a6fe60
Use comma as separator for `VIRTUALENV_PYTHON`
pneff Oct 28, 2020
a59e31c
Extend comma support to all list values
pneff Oct 28, 2020
4f891ef
Verify splitting change with new tests
pneff Oct 28, 2020
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
1 change: 1 addition & 0 deletions docs/changelog/1998.bugfix.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix processing of the ``VIRTUALENV_PYTHON`` environment variable
1 change: 1 addition & 0 deletions src/virtualenv/discovery/builtin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def add_parser_arguments(cls, parser):
"--python",
dest="python",
metavar="py",
type=str,
action="append",
default=[],
help="interpreter based on what to create environment (path/identifier) "
Expand Down
8 changes: 8 additions & 0 deletions tests/unit/config/test_env_var.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import pytest

from virtualenv.config.cli.parser import VirtualEnvOptions
from virtualenv.config.ini import IniConfig
from virtualenv.run import session_via_cli
from virtualenv.util.path import Path
Expand Down Expand Up @@ -31,6 +32,13 @@ def test_value_bad(monkeypatch, caplog, empty_conf):
assert "invalid literal" in caplog.messages[0]


def test_python_via_env_var(monkeypatch):
options = VirtualEnvOptions()
monkeypatch.setenv(str("VIRTUALENV_PYTHON"), str("python3"))

@gaborbernat gaborbernat Oct 28, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a test to validate that python2,python3 works as expected too?

@pneff pneff Oct 28, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I extended the code to provide that functionality. Multi-value was split with newline so far, though it seems the only other multi-value field is extra-search-dir.

Let me know if you are happy with the approach taken or would prefer a different way to do this.

session_via_cli(["venv"], options=options)
assert options.python == ["python3"]


def test_extra_search_dir_via_env_var(tmp_path, monkeypatch):
monkeypatch.chdir(tmp_path)
value = "a{}0{}b{}c".format(os.linesep, os.linesep, os.pathsep)
Expand Down