From 960d66ff4164fb3a38d2cf5e9cf5e47ed4054638 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Tue, 14 Apr 2020 11:34:40 -0700
Subject: [PATCH] Consolidate cover envs and default to py3-cover

---
 tox.ini | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/tox.ini b/tox.ini
index 8aa4bfbf2..7f5b7bd5a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 
 [tox]
 skipsdist = true
-envlist = modification,py3,py27-cover,lint,mypy
+envlist = modification,py3-cover,lint,mypy
 
 [base]
 # pip installs the requested packages in editable mode
@@ -63,8 +63,11 @@ source_paths =
 passenv =
     CERTBOT_NO_PIN
 commands =
-    {[base]install_and_test} {[base]all_packages}
-    python tests/lock_test.py
+    !cover: {[base]install_and_test} {[base]all_packages}
+    !cover: python tests/lock_test.py
+    cover: {[base]install_packages}
+    cover: {[base]pip_install} certbot-apache[dev]
+    cover: python tox.cover.py
 # We always recreate the virtual environment to avoid problems like
 # https://github.com/certbot/certbot/issues/7745.
 recreate = true
@@ -116,20 +119,6 @@ commands =
 setenv =
     {[testenv:py27-oldest]setenv}
 
-[testenv:py27-cover]
-basepython = python2.7
-commands =
-    {[base]install_packages}
-    {[base]pip_install} certbot-apache[dev]
-    python tox.cover.py
-
-[testenv:py37-cover]
-basepython = python3.7
-commands =
-    {[base]install_packages}
-    {[base]pip_install} certbot-apache[dev]
-    python tox.cover.py
-
 [testenv:lint]
 basepython = python3
 # separating into multiple invocations disables cross package