From e331d847c77084b8aa27dce24dd6649dcba1ea34 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 21 Oct 2020 15:09:34 -0700
Subject: [PATCH] Test on Python 3.9.

---
 .../templates/jobs/extended-tests-jobs.yml            | 11 +++++++++++
 .../templates/jobs/standard-tests-jobs.yml            |  6 +++---
 tox.ini                                               | 10 ++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
index 3197501e1..713823db6 100644
--- a/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/extended-tests-jobs.yml
@@ -14,6 +14,9 @@ jobs:
         linux-py37:
           PYTHON_VERSION: 3.7
           TOXENV: py37
+        linux-py38:
+          PYTHON_VERSION: 3.8
+          TOXENV: py38
         linux-py37-nopin:
           PYTHON_VERSION: 3.7
           TOXENV: py37
@@ -62,6 +65,14 @@ jobs:
           PYTHON_VERSION: 3.8
           TOXENV: integration
           ACME_SERVER: boulder-v2
+        linux-boulder-v1-py39-integration:
+          PYTHON_VERSION: 3.9
+          TOXENV: integration
+          ACME_SERVER: boulder-v1
+        linux-boulder-v2-py39-integration:
+          PYTHON_VERSION: 3.9
+          TOXENV: integration
+          ACME_SERVER: boulder-v2
         nginx-compat:
           TOXENV: nginx_compat
         linux-integration-rfc2136:
diff --git a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
index 7a1f620bb..cf3833f6f 100644
--- a/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
+++ b/.azure-pipelines/templates/jobs/standard-tests-jobs.yml
@@ -38,10 +38,10 @@ jobs:
           IMAGE_NAME: ubuntu-18.04
           PYTHON_VERSION: 3.6
           TOXENV: py36
-        linux-py38-cover:
+        linux-py39-cover:
           IMAGE_NAME: ubuntu-18.04
-          PYTHON_VERSION: 3.8
-          TOXENV: py38-cover
+          PYTHON_VERSION: 3.9
+          TOXENV: py39-cover
         linux-py37-lint:
           IMAGE_NAME: ubuntu-18.04
           PYTHON_VERSION: 3.7
diff --git a/tox.ini b/tox.ini
index 7f806bb4d..7a555325c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -221,6 +221,9 @@ whitelist_externals =
 passenv = DOCKER_*
 
 [testenv:integration]
+# If any new settings other than commands or passenv are set below, they need
+# to propagated to the testenv py39-integration until
+# https://github.com/certbot/certbot/issues/8384 is fixed.
 commands =
     {[base]pip_install} acme certbot certbot-nginx certbot-ci
     pytest certbot-ci/certbot_integration_tests \
@@ -231,6 +234,13 @@ commands =
     coverage report --include 'certbot-nginx/*' --show-missing --fail-under=74
 passenv = DOCKER_*
 
+[testenv:py39-integration]
+# This tox environment just exists to put py39 in the environment name which
+# earlier in the file we configured to boostrap pip, setuptools, and wheel
+# differently.
+commands = {[testenv:integration]commands}
+passenv = {[testenv:integration]passenv}
+
 [testenv:integration-certbot]
 commands =
     {[base]pip_install} acme certbot certbot-ci