Skip to content

Commit

Permalink
Partial revert of e4d0d60, fixing #1777 (#1794)
Browse files Browse the repository at this point in the history
  • Loading branch information
jayvdb authored Jan 11, 2021
1 parent ad6ca10 commit da140fb
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/changelog/1777.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix regression that broke using install_command in config replacements - by :user:`jayvdb`
6 changes: 6 additions & 0 deletions src/tox/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1848,6 +1848,12 @@ def _replace_match(self, match):
return os.pathsep

default_value = g["default_value"]
# special case: opts and packages. Leave {opts} and
# {packages} intact, they are replaced manually in
# _venv.VirtualEnv.run_install_command.
if sub_value in ("opts", "packages"):
return "{{{}}}".format(sub_value)

if sub_value == "posargs":
return self.reader.getposargs(default_value)

Expand Down
20 changes: 20 additions & 0 deletions tests/unit/config/test_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -1627,6 +1627,26 @@ def test_install_command_substitutions(self, newconfig):
]
assert envconfig.install_command == expected_deps

def test_install_command_substitutions_other_section(self, newconfig):
config = newconfig(
"""
[base]
install_command=some_install --arg={toxinidir}/foo \
{envname} {opts} {packages}
[testenv]
install_command={[base]install_command}
""",
)
envconfig = config.envconfigs["python"]
expected_deps = [
"some_install",
"--arg={}/foo".format(config.toxinidir),
"python",
"{opts}",
"{packages}",
]
assert envconfig.install_command == expected_deps

def test_pip_pre(self, newconfig):
config = newconfig(
"""
Expand Down

0 comments on commit da140fb

Please sign in to comment.