Parse [tox:testenv] sections in setup.cfg (#1724)

Author: mauvilsa

CONTRIBUTORS

@@ -71,6 +71,7 @@ Matt Good
 Matt Jeffery
 Matthew Kenigsberg
 Mattieu Agopian
+Mauricio Villegas
 Mehdi Abaakouk
 Michael Manganiello
 Mickaël Schoentgen

docs/changelog/1724.feature.rst

@@ -0,0 +1 @@
+Support parsing [tox:testenv*] sections in setup.cfg. - by :user:`mauvilsa`

docs/config.rst

@@ -15,8 +15,9 @@ At the moment tox supports three configuration locations prioritized in the foll
 As far as the configuration format at the moment we only support standard ConfigParser_ "ini-style" format
 (there is a plan to add a pure TOML one soon).
 ``tox.ini`` and ``setup.cfg`` are such files. Note that ``setup.cfg`` requires the content to be under the
-``tox:tox`` section and is otherwise ignored. ``pyproject.toml`` on the other hand is in TOML format. However, one can inline
-the *ini-style* format under the ``tool.tox.legacy_tox_ini`` key as a multi-line string.
+``tox:tox`` and ``tox:testenv`` sections and is otherwise ignored. ``pyproject.toml`` on the other hand is
+in TOML format. However, one can inline the *ini-style* format under the ``tool.tox.legacy_tox_ini`` key
+as a multi-line string.
 
 Below you find the specification for the *ini-style* format, but you might want to skim some
 :doc:`examples` first and use this page as a reference.

src/tox/config/__init__.py

@@ -1246,15 +1246,16 @@ def line_of_default_to_zero(section, name=None):
         results = {}
         cur_self = self
 
-        def run(name, section, subs, config):
+        def run(name, section, subs, config, prefix):
             try:
-                results[name] = cur_self.make_envconfig(name, section, subs, config)
+                results[name] = cur_self.make_envconfig(name, section, subs, config, prefix=prefix)
             except Exception as exception:
                 failures[name] = (exception, traceback.format_exc())
 
         order = []
+        prefix = "tox:" if ini_path.basename == "setup.cfg" else ""
         for name in all_envs:
-            section = "{}{}".format(testenvprefix, name)
+            section = "{}{}".format(prefix + testenvprefix, name)
             factors = set(name.split("-"))
             if (
                 section in self._cfg
@@ -1264,7 +1265,7 @@ def run(name, section, subs, config):
                 )
             ):
                 order.append(name)
-                thread = Thread(target=run, args=(name, section, reader._subs, config))
+                thread = Thread(target=run, args=(name, section, reader._subs, config, prefix))
                 thread.daemon = True
                 thread.start()
                 to_do.append(thread)
@@ -1377,9 +1378,14 @@ def _list_section_factors(self, section):
                 factors.update(*mapcat(_split_factor_expr_all, exprs))
         return factors
 
-    def make_envconfig(self, name, section, subs, config, replace=True):
+    def make_envconfig(self, name, section, subs, config, replace=True, prefix=""):
         factors = set(name.split("-"))
-        reader = SectionReader(section, self._cfg, fallbacksections=["testenv"], factors=factors)
+        reader = SectionReader(
+            section,
+            self._cfg,
+            fallbacksections=[prefix + "testenv"],
+            factors=factors,
+        )
         tc = TestenvConfig(name, config, factors, reader)
         reader.addsubstitutions(
             envname=name,

tests/unit/config/test_config.py

@@ -91,6 +91,24 @@ def test_envdir_set_manually_with_substitutions(self, newconfig):
         envconfig = config.envconfigs["dev"]
         assert envconfig.envdir == config.toxworkdir.join("foobar")
 
+    def test_envdir_set_manually_setup_cfg(self, tmpdir, newconfig):
+        config = newconfig(
+            [],
+            """
+            [tox:tox]
+            envlist = py36,py37
+            [tox:testenv]
+            envdir = dev
+            [tox:testenv:py36]
+            envdir = dev36
+        """,
+            filename="setup.cfg",
+        )
+        envconfig = config.envconfigs["py36"]
+        assert envconfig.envdir == tmpdir.join("dev36")
+        envconfig = config.envconfigs["py37"]
+        assert envconfig.envdir == tmpdir.join("dev")
+
     def test_force_dep_version(self, initproj):
         """
         Make sure we can override dependencies configured in tox.ini when using the command line