From cad95466b05e6be51c1c29eaa91e6e3b7ea3cefd Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@users.noreply.github.com>
Date: Thu, 5 Jul 2018 02:11:04 -0700
Subject: [PATCH] Allow py37 testing (#6170)

* 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.

* add py37 tox environment
---
 tox.ini | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tox.ini b/tox.ini
index ef71b52be..b44d30449 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 =
@@ -62,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}