@@ -1484,7 +1484,7 @@ def make_envconfig(self, name, section, subs, config, replace=True):
1484
1484
reader .addsubstitutions (** {env_attr .name : res })
1485
1485
return tc
1486
1486
1487
- def _getallenvs (self , reader , extra_env_list = None ):
1487
+ def _getallenvs (self , reader , config , extra_env_list = None ):
1488
1488
extra_env_list = extra_env_list or []
1489
1489
env_str = reader .getstring ("envlist" , replace = False )
1490
1490
env_list = _split_env (env_str )
@@ -1493,9 +1493,12 @@ def _getallenvs(self, reader, extra_env_list=None):
1493
1493
env_list .append (env )
1494
1494
1495
1495
all_envs = OrderedDict ((i , None ) for i in env_list )
1496
+ package_env = config .isolated_build_env if config .isolated_build is True else None
1496
1497
for section in self ._cfg :
1497
1498
if section .name .startswith (testenvprefix ):
1498
- all_envs [section .name [len (testenvprefix ) :]] = None
1499
+ section_env = section .name [len (testenvprefix ) :]
1500
+ if section_env != package_env :
1501
+ all_envs [section_env ] = None
1499
1502
if not all_envs :
1500
1503
all_envs ["python" ] = None
1501
1504
return list (all_envs .keys ())
@@ -1511,7 +1514,7 @@ def _getenvdata(self, reader, config):
1511
1514
(from_option and "ALL" in from_option )
1512
1515
or (not from_option and from_environ and "ALL" in from_environ .split ("," ))
1513
1516
) and PARALLEL_ENV_VAR_KEY_PRIVATE not in os .environ :
1514
- all_envs = self ._getallenvs (reader )
1517
+ all_envs = self ._getallenvs (reader , config )
1515
1518
else :
1516
1519
candidates = (
1517
1520
(os .environ .get (PARALLEL_ENV_VAR_KEY_PRIVATE ), True ),
@@ -1522,7 +1525,7 @@ def _getenvdata(self, reader, config):
1522
1525
)
1523
1526
env_str , envlist_explicit = next (((i , e ) for i , e in candidates if i ), ([], False ))
1524
1527
env_list = _split_env (env_str )
1525
- all_envs = self ._getallenvs (reader , env_list )
1528
+ all_envs = self ._getallenvs (reader , config , env_list )
1526
1529
1527
1530
if not env_list :
1528
1531
env_list = all_envs
@@ -1533,9 +1536,6 @@ def _getenvdata(self, reader, config):
1533
1536
raise tox .exception .ConfigError (msg )
1534
1537
1535
1538
package_env = config .isolated_build_env
1536
- if config .isolated_build is True and package_env in all_envs :
1537
- all_envs .remove (package_env )
1538
-
1539
1539
if config .isolated_build is True and package_env in env_list :
1540
1540
msg = "isolated_build_env {} cannot be part of envlist" .format (package_env )
1541
1541
raise tox .exception .ConfigError (msg )
0 commit comments