From 6cd17e12830e93f5d0103cfe472ba2e49977425a Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 2 Jul 2018 15:29:52 -0700
Subject: [PATCH 1/2] Reorganize packages in tox to allow for py37 tests

certbot-dns-cloudflare doesn't currently work in Python 3.7 because it transitively depends on pyYAML which doesn't yet support Python 3.7. See https://github.com/yaml/pyyaml/issues/126 for more info.
---
 tox.ini | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index ef71b52be..f10df6f6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,8 +14,7 @@ pip_install = {toxinidir}/tools/pip_install_editable.sh
 # 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 = {toxinidir}/tools/install_and_test.sh
-dns_packages =
-    certbot-dns-cloudflare \
+python37_compatible_dns_packages =
     certbot-dns-cloudxns \
     certbot-dns-digitalocean \
     certbot-dns-dnsimple \
@@ -25,14 +24,22 @@ dns_packages =
     certbot-dns-nsone \
     certbot-dns-rfc2136 \
     certbot-dns-route53
-all_packages =
+dns_packages =
+    certbot-dns-cloudflare \
+    {[base]python37_compatible_dns_packages}
+nondns_packages =
     acme[dev] \
     .[dev] \
     certbot-apache \
-    {[base]dns_packages} \
     certbot-nginx \
     certbot-postfix \
     letshelp-certbot
+python37_compatible_packages =
+    {[base]nondns_packages} \
+    {[base]python37_compatible_dns_packages}
+all_packages =
+    {[base]nondns_packages} \
+    {[base]dns_packages}
 install_packages =
     {toxinidir}/tools/pip_install_editable.sh {[base]all_packages}
 source_paths =

From dc1364a3bb4c468efc74810ec5934229148972ac Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Mon, 2 Jul 2018 15:33:18 -0700
Subject: [PATCH 2/2] add py37 tox environment

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

diff --git a/tox.ini b/tox.ini
index f10df6f6f..b44d30449 100644
--- a/tox.ini
+++ b/tox.ini
@@ -69,6 +69,13 @@ commands =
 setenv =
     PYTHONHASHSEED = 0
 
+[testenv:py37]
+commands =
+    {[base]install_and_test} {[base]python37_compatible_packages}
+    python tests/lock_test.py
+setenv =
+    {[testenv]setenv}
+
 [testenv:py27-oldest]
 commands =
     {[testenv]commands}