Merge pull request #160 from readthedocs/humitos/port-support-py39-ma…

…ster
readthedocs · Feb 15, 2021 · 47679ba · 47679ba
2 parents 154b49c + af6a705
commit 47679ba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -150,7 +150,7 @@ ENV RTD_PYTHON_VERSION_35 3.5.10
 ENV RTD_PYTHON_VERSION_36 3.6.12
 ENV RTD_PYTHON_VERSION_37 3.7.9
 ENV RTD_PYTHON_VERSION_38 3.8.6
-ENV RTD_PYTHON_VERSION_39 3.9.0
+ENV RTD_PYTHON_VERSION_39 3.9.1
 ENV RTD_PYPY_VERSION_35 pypy3.5-7.0.0
 
 # Install supported Python versions

diff --git a/tests/test_versions.py b/tests/test_versions.py
@@ -14,25 +14,29 @@
         ('python3.6 --version', 'Python 3.6.12'),
         ('python3.7 --version', 'Python 3.7.9'),
         ('python3.8 --version', 'Python 3.8.6'),
+        ('python3.9 --version', 'Python 3.9.1'),
         ('pypy3.5 --version', 'Python 3.5.3 (928a4f70d3de7d17449456946154c5da6e600162, Feb 09 2019, 11:50:43)\n[PyPy 7.0.0 with GCC 8.2.0]'),
         # pip
         ('python2 -m pip --version', "pip 20.0.1 from /home/docs/.pyenv/versions/2.7.18/lib/python2.7/site-packages/pip (python 2.7)"),
         ('python3.5 -m pip --version', "pip 20.0.1 from /home/docs/.pyenv/versions/3.5.10/lib/python3.5/site-packages/pip (python 3.5)"),
         ('python3.6 -m pip --version', "pip 20.0.1 from /home/docs/.pyenv/versions/3.6.12/lib/python3.6/site-packages/pip (python 3.6)"),
         ('python3.7 -m pip --version', "pip 20.0.1 from /home/docs/.pyenv/versions/3.7.9/lib/python3.7/site-packages/pip (python 3.7)"),
         ('python3.8 -m pip --version', "pip 20.0.1 from /home/docs/.pyenv/versions/3.8.6/lib/python3.8/site-packages/pip (python 3.8)"),
+        ('python3.9 -m pip --version', "pip 20.0.1 from /home/docs/.pyenv/versions/3.9.1/lib/python3.9/site-packages/pip (python 3.9)"),
         # setuptools
         ('python2 -c "import setuptools; print(setuptools.__version__)"', "44.0.0"),
         ('python3.5 -c "import setuptools; print(setuptools.__version__)"', "45.1.0"),
         ('python3.6 -c "import setuptools; print(setuptools.__version__)"', "45.1.0"),
         ('python3.7 -c "import setuptools; print(setuptools.__version__)"', "45.1.0"),
         ('python3.8 -c "import setuptools; print(setuptools.__version__)"', "45.1.0"),
+        ('python3.9 -c "import setuptools; print(setuptools.__version__)"', "45.1.0"),
         # virtualenv
         ('python2 -m virtualenv --version', '16.7.9'),
         ('python3.5 -m virtualenv --version', '16.7.9'),
         ('python3.6 -m virtualenv --version', '16.7.9'),
         ('python3.7 -m virtualenv --version', '16.7.9'),
         ('python3.8 -m virtualenv --version', '16.7.9'),
+        ('python3.9 -m virtualenv --version', '16.7.9'),
         # others
         ('node --version', 'v10.19.0'),
         ('npm --version', '6.14.4'),
@@ -56,25 +60,29 @@ def test_command_versions_image_master(command, expected_output):
         ('python3.6 --version', 'Python 3.6.12'),
         ('python3.7 --version', 'Python 3.7.9'),
         ('python3.8 --version', 'Python 3.8.6'),
+        ('python3.9 --version', 'Python 3.9.1'),
         ('pypy3.5 --version', 'Python 3.5.3 (928a4f70d3de7d17449456946154c5da6e600162, Feb 09 2019, 11:50:43)\n[PyPy 7.0.0 with GCC 8.2.0]'),
         # pip
         ('python2 -m pip --version', "pip 20.0.2 from /home/docs/.pyenv/versions/2.7.18/lib/python2.7/site-packages/pip (python 2.7)"),
         ('python3.5 -m pip --version', "pip 20.0.2 from /home/docs/.pyenv/versions/3.5.10/lib/python3.5/site-packages/pip (python 3.5)"),
         ('python3.6 -m pip --version', "pip 20.0.2 from /home/docs/.pyenv/versions/3.6.12/lib/python3.6/site-packages/pip (python 3.6)"),
         ('python3.7 -m pip --version', "pip 20.0.2 from /home/docs/.pyenv/versions/3.7.9/lib/python3.7/site-packages/pip (python 3.7)"),
         ('python3.8 -m pip --version', "pip 20.0.2 from /home/docs/.pyenv/versions/3.8.6/lib/python3.8/site-packages/pip (python 3.8)"),
+        ('python3.9 -m pip --version', "pip 20.0.2 from /home/docs/.pyenv/versions/3.9.1/lib/python3.9/site-packages/pip (python 3.9)"),
         # setuptools
         ('python2 -c "import setuptools; print(setuptools.__version__)"', "44.0.0"),
         ('python3.5 -c "import setuptools; print(setuptools.__version__)"', "45.2.0"),
         ('python3.6 -c "import setuptools; print(setuptools.__version__)"', "45.2.0"),
         ('python3.7 -c "import setuptools; print(setuptools.__version__)"', "45.2.0"),
         ('python3.8 -c "import setuptools; print(setuptools.__version__)"', "45.2.0"),
+        ('python3.9 -c "import setuptools; print(setuptools.__version__)"', "45.2.0"),
         # virtualenv
         ('python2 -m virtualenv --version', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/2.7.18/lib/python2.7/site-packages/virtualenv/__init__.pyc'),
         ('python3.5 -m virtualenv --version', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.5.10/lib/python3.5/site-packages/virtualenv/__init__.py'),
         ('python3.6 -m virtualenv --version', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.6.12/lib/python3.6/site-packages/virtualenv/__init__.py'),
         ('python3.7 -m virtualenv --version', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.7.9/lib/python3.7/site-packages/virtualenv/__init__.py'),
         ('python3.8 -m virtualenv --version', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.8.6/lib/python3.8/site-packages/virtualenv/__init__.py'),
+        ('python3.9 -m virtualenv --version', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.9.1/lib/python3.9/site-packages/virtualenv/__init__.py'),
         # others
         ('node --version', 'v8.10.0'),
         ('npm --version', '3.5.2'),