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

Jump to bottom

Do not modify provisioned envdir when --devenv is specified #2066

Merged
merged 4 commits into from May 24, 2021
Merged

Do not modify provisioned envdir when --devenv is specified #2066

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8e4af11
Prevent modification of previsioned envdir when using --devenv
May 20, 2021
99930e7
Add test to ensure that --devenv does not change provisioning directory
May 20, 2021
868c59a
Read provision_tox_env from config rather than assuming it is unchanged
isaac-ped May 23, 2021
f946a9c
Add changelog entry and contributor for #2065
isaac-ped May 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tox/config/__init__.py
View file
Open in desktop
Expand Up @@ -595,7 +595,7 @@ def tox_addoption(parser):
)

def _set_envdir_from_devenv(testenv_config, value):
if testenv_config.config.option.devenv is not None:
if testenv_config.config.option.devenv is not None and testenv_config.envname != ".tox":
isaac-ped marked this conversation as resolved.
Show resolved Hide resolved
return py.path.local(testenv_config.config.option.devenv)
else:
return value
Expand Down
17 changes: 17 additions & 0 deletions tests/unit/session/test_provision.py
View file
Open in desktop
Expand Up @@ -385,3 +385,20 @@ def space_path2url(path):
if " " not in at_path:
return at_path
return urljoin("file:", pathname2url(os.path.abspath(at_path)))


def test_provision_does_not_occur_in_devenv(newconfig, next_tox_major):
"""Adding --devenv should not change the directory where provisioning occurs"""
with pytest.raises(MissingRequirement) as context:
newconfig(
["--devenv", "my_devenv"],
"""\
[tox]
minversion = {}
""".format(
next_tox_major,
),
)
config = context.value.config
assert config.run_provision is True
assert config.envconfigs[".tox"].envdir.basename != "my_devenv"