diff options
author | Miro HronĨok <miro@hroncok.cz> | 2020-08-06 11:37:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-06 10:37:02 +0100 |
commit | 6f5bee8473c44b8f8d8ede8df7c4550cecb2cdbb (patch) | |
tree | f81d81e527e2f7bd3ab0bbcc245d79f825cc2ded /src | |
parent | 9d011829cf3d7d73d82e1700fe864fdaa7ca71f8 (diff) | |
download | tox-git-6f5bee8473c44b8f8d8ede8df7c4550cecb2cdbb.tar.gz |
Do not use setup.cfg file that does not have tox:tox namespace (#1642)
Diffstat (limited to 'src')
-rw-r--r-- | src/tox/config/__init__.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py index f1e4f90c..c4ab743f 100644 --- a/src/tox/config/__init__.py +++ b/src/tox/config/__init__.py @@ -271,7 +271,10 @@ def parseconfig(args, plugins=()): content = toml_content["tool"]["tox"]["legacy_tox_ini"] except KeyError: continue - ParseIni(config, config_file, content) + try: + ParseIni(config, config_file, content) + except SkipThisIni: + continue pm.hook.tox_configure(config=config) # post process config object break else: @@ -1045,6 +1048,10 @@ def make_hashseed(): return str(random.randint(1, max_seed)) +class SkipThisIni(Exception): + """Internal exception to indicate the parsed ini file should be skipped""" + + class ParseIni(object): def __init__(self, config, ini_path, ini_data): # noqa config.toxinipath = ini_path @@ -1052,6 +1059,11 @@ class ParseIni(object): config.toxinidir = config.toxinipath.dirpath() self._cfg = py.iniconfig.IniConfig(config.toxinipath, ini_data) + + if ini_path.basename == "setup.cfg" and "tox:tox" not in self._cfg: + verbosity1("Found no [tox:tox] section in setup.cfg, skipping.") + raise SkipThisIni() + previous_line_of = self._cfg.lineof self.expand_section_names(self._cfg) |