Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions docs/changelog/2831.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
``set_env`` values explicitly defined in a section now take precedence over values inherited via cross-section
substitution (e.g., ``{[testenv]set_env}``) - by :user:`gaborbernat`.
3 changes: 2 additions & 1 deletion src/tox/config/set_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ def _iter_needs_replacement(self) -> Iterator[str]:
sub_raw[key] = value # noqa: PERF403
else:
key, value, marker = self._extract_key_value_marker(sub_line)
sub_raw[key] = value
if key not in self._raw:
sub_raw[key] = value
if marker:
self._markers[key] = Marker(marker)
self._materialized = {k: v for k, v in self._materialized.items() if k not in sub_raw}
Expand Down
25 changes: 24 additions & 1 deletion tests/config/test_set_env.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def test_set_env_environment_with_file_and_expanded_substitution(
"PIP_DISABLE_PIP_VERSION_CHECK": "1",
"PYTHONHASHSEED": ANY,
"PYTHONIOENCODING": "utf-8",
"PRECENDENCE_TEST_1": "1_expanded_precedence",
"PRECENDENCE_TEST_1": "1_self_precedence",
"PRECENDENCE_TEST_2": "2_self_precedence",
"PRECENDENCE_TEST_3": "3_file_precedence",
}
Expand Down Expand Up @@ -380,6 +380,29 @@ def test_set_env_marker_with_replace_toml(
assert "CONDITIONAL" not in set_env


def test_set_env_cross_section_override(tox_project: ToxProjectCreator) -> None:
ini = """\
[testenv]
skip_install = true
set_env =
OS_TEST_PATH=./tests/unit
commands = python -c "import os; print(os.environ['OS_TEST_PATH'])"

[testenv:functional]
set_env =
{[testenv]set_env}
OS_TEST_PATH=./tests/functional
commands = python -c "import os; print(os.environ['OS_TEST_PATH'])"

[testenv:functional-py]
set_env = {[testenv:functional]set_env}
commands = {[testenv:functional]commands}
"""
result = tox_project({"tox.ini": ini}).run("r", "-e", "functional-py")
result.assert_success()
assert result.out.splitlines()[1] == "./tests/functional"


def test_set_env_marker_mixed(eval_set_env: EvalSetEnv) -> None:
marker = f"sys_platform == '{sys.platform}'"
config = (
Expand Down