From 22d62cb9a4ac1210c39d8c427cd77216afab2612 Mon Sep 17 00:00:00 2001
From: Greg Jones <greg.jones@gmail.com>
Date: Fri, 5 Mar 2021 16:02:37 +0100
Subject: [PATCH] Add py39 to set of tested versions

This requires updating tox, which requires a higher version of
six than was being specified.
---
 .semaphore/semaphore.yml | 3 ++-
 setup.py                 | 5 +++--
 tox.ini                  | 4 +++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index ea4e688..15ea2c4 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -33,6 +33,7 @@ blocks:
           - checkout
           - mkdir "${PIP_CACHE_DIR}"
           - cache restore "setup-${SEMAPHORE_GIT_BRANCH}-$(checksum setup.py)","setup-${SEMAPHORE_GIT_BRANCH}",setup-master
+          - pip install --upgrade pip
           - pip install --user tox
       jobs:
         - name: Tests
@@ -40,7 +41,7 @@ blocks:
             - tox
           matrix:
             - env_var: TOXENV
-              values: ["py27", "py36", "py37"]
+              values: ["py27", "py36", "py37", "py39"]
         - name: Gather coverage data
           commands:
             - tox -e coverage
diff --git a/setup.py b/setup.py
index a6614b1..f4227dd 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
 from setuptools import setup, find_packages
 
 GENERIC_REQ = [
-    "six==1.12.0",
+    "six>=1.12.0",
     "requests==2.22.0",
     "pyrfc3339==1.1",
     "cachetools==3.1.1",
@@ -32,7 +32,7 @@
 ]
 
 TESTS_REQ = [
-    'tox==3.13.2',
+    'tox==3.23.0',
     'mock==3.0.5',
     "pytest-sugar==0.9.2",
     "pytest-html==1.22.0",
@@ -99,6 +99,7 @@ def main():
             "Programming Language :: Python :: 3.5",
             "Programming Language :: Python :: 3.6",
             "Programming Language :: Python :: 3.7",
+            "Programming Language :: Python :: 3.9",
             "Topic :: Internet",
             "Topic :: Software Development :: Libraries :: Python Modules",
             "Topic :: System :: Clustering",
diff --git a/tox.ini b/tox.ini
index 237319c..87e7588 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,7 @@
 [tox]
-envlist = py27,py35,py36,py37
+envlist = py27,py35,py36,py37,py39
+requires = setuptools==44.1.1
+           virtualenv==20.4.2
 skip_missing_interpreters=True
 
 [testenv]