From 891ce5ee40daa3c1284ea61dc8c6b73fda0072b1 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 1 Feb 2021 16:26:10 +0100 Subject: [PATCH 1/2] Support Python 3.9 on "master" image Port changes from https://github.com/readthedocs/readthedocs-docker-images/pull/159 into `master` branch. --- Dockerfile | 2 +- tests/test_versions.py | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7091c6a..187747d 100644 --- 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 index fe901ce..0b7068d 100644 --- a/tests/test_versions.py +++ b/tests/test_versions.py @@ -14,6 +14,7 @@ ('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)"), @@ -21,18 +22,21 @@ ('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.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.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.2.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', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.9.1/lib/python3.9/site-packages/virtualenv/__init__.py'), # others ('node --version', 'v10.19.0'), ('npm --version', '6.14.4'), @@ -56,6 +60,7 @@ 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)"), @@ -63,18 +68,21 @@ def test_command_versions_image_master(command, expected_output): ('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'), From af6a7051e30e6fcd6070396a5d1e02100bc8b742 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Tue, 2 Feb 2021 10:32:14 +0100 Subject: [PATCH 2/2] Make test to pass using the same versions as expected --- tests/test_versions.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_versions.py b/tests/test_versions.py index 0b7068d..4b2c00b 100644 --- a/tests/test_versions.py +++ b/tests/test_versions.py @@ -22,21 +22,21 @@ ('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.2 from /home/docs/.pyenv/versions/3.9.1/lib/python3.9/site-packages/pip (python 3.9)"), + ('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.2.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', 'virtualenv 20.0.7 from /home/docs/.pyenv/versions/3.9.1/lib/python3.9/site-packages/virtualenv/__init__.py'), + ('python3.9 -m virtualenv --version', '16.7.9'), # others ('node --version', 'v10.19.0'), ('npm --version', '6.14.4'),