From d3933a3ed3b2d989384c8fe59d05e4a680d8e5e8 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sat, 22 Feb 2020 21:27:27 +0000
Subject: [PATCH 1/4] Bump CPython patch releases - 3.5.9, 3.6.10, 3.7.6, 3.8.1

---
 Dockerfile          | 2 +-
 python-versions.txt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b4cad03..33178cd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,7 @@ RUN set -x && \
     gosu nobody true && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN pyenv local 3.7.5 && \
+RUN pyenv local 3.7.6 && \
     python -m pip install -U pip && \
     python -m pip install tox==3.14.0 && \
     pyenv local --unset && \
diff --git a/python-versions.txt b/python-versions.txt
index f075034..eb3e035 100644
--- a/python-versions.txt
+++ b/python-versions.txt
@@ -1,7 +1,7 @@
-3.8.0
-3.7.5
-3.6.9
-3.5.7
+3.8.1
+3.7.6
+3.6.10
+3.5.9
 3.4.10
 3.3.7
 2.7.17

From 47ab7c87b36f3dee3554e6304e3b3b6d67f5bdbd Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sat, 22 Feb 2020 21:28:45 +0000
Subject: [PATCH 2/4] Bump PyPy minor release: 7.3.0

---
 python-versions.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/python-versions.txt b/python-versions.txt
index eb3e035..540a889 100644
--- a/python-versions.txt
+++ b/python-versions.txt
@@ -6,6 +6,6 @@
 3.3.7
 2.7.17
 2.6.9
-pypy2.7-7.2.0
-pypy3.6-7.2.0
+pypy2.7-7.3.0
+pypy3.6-7.3.0
 pypy3.3-5.5-alpha

From 970f3cb0a174962ece8d8eb93c21532411212824 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Sat, 22 Feb 2020 21:29:20 +0000
Subject: [PATCH 3/4] Bump tox patch release 3.14.5

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 33178cd..3279b28 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN set -x && \
 
 RUN pyenv local 3.7.6 && \
     python -m pip install -U pip && \
-    python -m pip install tox==3.14.0 && \
+    python -m pip install tox==3.14.5 && \
     pyenv local --unset && \
     pyenv rehash
 

From 24f39f6ce2a9181d9c54f677c97e3f93a1f6e983 Mon Sep 17 00:00:00 2001
From: Alex Willmer <alex@moreati.org.uk>
Date: Fri, 22 Jan 2021 17:29:08 +0000
Subject: [PATCH 4/4] Update to Tox 3.21.2, CPythons (e.g. 3.9.1), PyPys
 (7.3.3)

---
 Dockerfile          |  7 +++++--
 README.md           |  5 ++++-
 python-versions.txt | 16 +++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 3279b28..85e5e16 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,12 @@ RUN set -x && \
     gosu nobody true && \
     apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-RUN pyenv local 3.7.6 && \
+ENV TOX_PYTHON_VERSION 3.9.1
+ENV TOX_VERSION 3.21.2
+
+RUN pyenv local $TOX_PYTHON_VERSION && \
     python -m pip install -U pip && \
-    python -m pip install tox==3.14.5 && \
+    python -m pip install tox==$TOX_VERSION && \
     pyenv local --unset && \
     pyenv rehash
 
diff --git a/README.md b/README.md
index dea4d22..307cdcd 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,7 @@
 # Tox-Base
 
-This image contains Python versions 2.6, 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, PyPy, and PyPy3.
+This image contains
+  - Python versions 2.6, 2.7, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9
+  - PyPy versions 2.7, 3.6, 3.7
+
 It also includes [tox](https://pypi.python.org/pypi/tox) for running test automation against the various versions.
diff --git a/python-versions.txt b/python-versions.txt
index 540a889..4fc859d 100644
--- a/python-versions.txt
+++ b/python-versions.txt
@@ -1,11 +1,13 @@
-3.8.1
-3.7.6
-3.6.10
+3.9.1
+3.8.7
+3.7.9
+3.6.12
 3.5.9
 3.4.10
 3.3.7
-2.7.17
+2.7.18
 2.6.9
-pypy2.7-7.3.0
-pypy3.6-7.3.0
-pypy3.3-5.5-alpha
+
+pypy3.7-7.3.3
+pypy3.6-7.3.3
+pypy2.7-7.3.3