summaryrefslogtreecommitdiff
path: root/src/tox/config/main.py
diff options
context:
space:
mode:
authorBernát Gábor <gaborjbernat@gmail.com>2023-01-03 18:05:12 -0800
committerGitHub <noreply@github.com>2023-01-03 18:05:12 -0800
commit82dcd45af55af239a7be81ee2e86948c6fe75518 (patch)
treefc35818cc20bf04b64e77c046b8726bc280ce320 /src/tox/config/main.py
parent31c8d1fc48ccf95f66b2920b356f9490686ccfc7 (diff)
downloadtox-git-82dcd45af55af239a7be81ee2e86948c6fe75518.tar.gz
Packaging inherits from pkgenv, deps and document tox 4 packaging changes (#2813)
Resolves https://github.com/tox-dev/tox/issues/2543
Diffstat (limited to 'src/tox/config/main.py')
-rw-r--r--src/tox/config/main.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tox/config/main.py b/src/tox/config/main.py
index 38efb600..00aaaed8 100644
--- a/src/tox/config/main.py
+++ b/src/tox/config/main.py
@@ -152,10 +152,10 @@ class Config:
:param loaders: loaders to use for this configuration (only used for creation)
:return: the tox environments config
"""
- section, base = self._src.get_tox_env_section(item)
+ section, base_test, base_pkg = self._src.get_tox_env_section(item)
conf_set = self.get_section_config(
section,
- base=None if package else base,
+ base=base_pkg if package else base_test,
of_type=EnvConfigSet,
for_env=item,
loaders=loaders,
@@ -163,7 +163,7 @@ class Config:
return conf_set
def clear_env(self, name: str) -> None:
- section, _ = self._src.get_tox_env_section(name)
+ section, _, __ = self._src.get_tox_env_section(name)
del self._key_to_conf_set[(section.key, name)]