From 9082c8d9bf82ca7cf3b7f1c0721b657c9216154d Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Tue, 25 May 2021 09:58:52 -0700
Subject: [PATCH] list packages on one line in tox.ini

---
 tox.ini | 52 +++++++---------------------------------------------
 1 file changed, 7 insertions(+), 45 deletions(-)

diff --git a/tox.ini b/tox.ini
index 399076043..cfe6ba2c5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,51 +14,13 @@ pip_install = python {toxinidir}/tools/pip_install_editable.py
 # before the script moves on to the next package. All dependencies are pinned
 # to a specific version for increased stability for developers.
 install_and_test = python {toxinidir}/tools/install_and_test.py
-dns_packages =
-    certbot-dns-cloudflare \
-    certbot-dns-cloudxns \
-    certbot-dns-digitalocean \
-    certbot-dns-dnsimple \
-    certbot-dns-dnsmadeeasy \
-    certbot-dns-gehirn \
-    certbot-dns-google \
-    certbot-dns-linode \
-    certbot-dns-luadns \
-    certbot-dns-nsone \
-    certbot-dns-ovh \
-    certbot-dns-rfc2136 \
-    certbot-dns-route53 \
-    certbot-dns-sakuracloud
-all_packages =
-    acme[dev] \
-    certbot[dev] \
-    certbot-apache \
-    {[base]dns_packages} \
-    certbot-nginx
-install_packages =
-    python {toxinidir}/tools/pip_install_editable.py {[base]all_packages}
-source_paths =
-    acme/acme
-    certbot/certbot
-    certbot-ci/certbot_integration_tests
-    certbot-apache/certbot_apache
-    certbot-compatibility-test/certbot_compatibility_test
-    certbot-dns-cloudflare/certbot_dns_cloudflare
-    certbot-dns-cloudxns/certbot_dns_cloudxns
-    certbot-dns-digitalocean/certbot_dns_digitalocean
-    certbot-dns-dnsimple/certbot_dns_dnsimple
-    certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy
-    certbot-dns-gehirn/certbot_dns_gehirn
-    certbot-dns-google/certbot_dns_google
-    certbot-dns-linode/certbot_dns_linode
-    certbot-dns-luadns/certbot_dns_luadns
-    certbot-dns-nsone/certbot_dns_nsone
-    certbot-dns-ovh/certbot_dns_ovh
-    certbot-dns-rfc2136/certbot_dns_rfc2136
-    certbot-dns-route53/certbot_dns_route53
-    certbot-dns-sakuracloud/certbot_dns_sakuracloud
-    certbot-nginx/certbot_nginx
-    tests/lock_test.py
+install_packages = python {toxinidir}/tools/pip_install_editable.py {[base]all_packages}
+# Packages are listed on one line because tox seems to have inconsistent
+# behavior with substitutions that contain line continuations, see
+# https://github.com/tox-dev/tox/issues/2069 for more info.
+dns_packages = certbot-dns-cloudflare certbot-dns-cloudxns certbot-dns-digitalocean certbot-dns-dnsimple certbot-dns-dnsmadeeasy certbot-dns-gehirn certbot-dns-google certbot-dns-linode certbot-dns-luadns certbot-dns-nsone certbot-dns-ovh certbot-dns-rfc2136 certbot-dns-route53 certbot-dns-sakuracloud
+all_packages = acme[dev] certbot[dev] certbot-apache {[base]dns_packages} certbot-nginx
+source_paths = acme/acme certbot/certbot certbot-ci/certbot_integration_tests certbot-apache/certbot_apache certbot-compatibility-test/certbot_compatibility_test certbot-dns-cloudflare/certbot_dns_cloudflare certbot-dns-cloudxns/certbot_dns_cloudxns certbot-dns-digitalocean/certbot_dns_digitalocean certbot-dns-dnsimple/certbot_dns_dnsimple certbot-dns-dnsmadeeasy/certbot_dns_dnsmadeeasy certbot-dns-gehirn/certbot_dns_gehirn certbot-dns-google/certbot_dns_google certbot-dns-linode/certbot_dns_linode certbot-dns-luadns/certbot_dns_luadns certbot-dns-nsone/certbot_dns_nsone certbot-dns-ovh/certbot_dns_ovh certbot-dns-rfc2136/certbot_dns_rfc2136 certbot-dns-route53/certbot_dns_route53 certbot-dns-sakuracloud/certbot_dns_sakuracloud certbot-nginx/certbot_nginx tests/lock_test.py
 
 [testenv]
 passenv =