From ce9bfdeb60c8defb6b31601bf9f586b693d0f874 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 27 Aug 2020 11:55:53 +0200 Subject: [PATCH 1/9] Upgrade Ubuntu to 20.04 LTS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2c318e8..f764785 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Read the Docs - Environment base -FROM ubuntu:18.04 +FROM ubuntu:20.04 LABEL mantainer="Read the Docs " ENV DEBIAN_FRONTEND noninteractive From 3ea74e0151c7bd149aa21ee9ae3092f5c58e0869 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 27 Aug 2020 11:56:25 +0200 Subject: [PATCH 2/9] Add early support for Python 3.9.0rc1 Since we are upgrading the Docker image version, it's good to be prepared to have a newer Python version as well. We can start testing 3.9.0rc1 and finally upgrade to 3.9.0 stable in a minor fix docker image release. --- Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfile b/Dockerfile index f764785..eda9d0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -150,10 +150,12 @@ ENV RTD_PYTHON_VERSION_35 3.5.7 ENV RTD_PYTHON_VERSION_36 3.6.8 ENV RTD_PYTHON_VERSION_37 3.7.3 ENV RTD_PYTHON_VERSION_38 3.8.0 +ENV RTD_PYTHON_VERSION_39 3.9.0rc1 ENV RTD_PYPY_VERSION_35 pypy3.5-7.0.0 # Install supported Python versions RUN pyenv install $RTD_PYTHON_VERSION_27 && \ + pyenv install $RTD_PYTHON_VERSION_39 && \ pyenv install $RTD_PYTHON_VERSION_38 && \ pyenv install $RTD_PYTHON_VERSION_37 && \ pyenv install $RTD_PYTHON_VERSION_35 && \ @@ -161,6 +163,7 @@ RUN pyenv install $RTD_PYTHON_VERSION_27 && \ pyenv install $RTD_PYPY_VERSION_35 && \ pyenv global \ $RTD_PYTHON_VERSION_27 \ + $RTD_PYTHON_VERSION_39 \ $RTD_PYTHON_VERSION_38 \ $RTD_PYTHON_VERSION_37 \ $RTD_PYTHON_VERSION_36 \ @@ -180,6 +183,12 @@ RUN pyenv local $RTD_PYTHON_VERSION_27 && \ ENV RTD_PIP_VERSION 20.0.1 ENV RTD_SETUPTOOLS_VERSION 45.1.0 +RUN pyenv local $RTD_PYTHON_VERSION_39 && \ + pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \ + pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \ + pyenv exec pip install --no-cache-dir --only-binary numpy numpy && \ + pyenv exec pip install --no-cache-dir pandas matplotlib virtualenv==$RTD_VIRTUALENV_VERSION + RUN pyenv local $RTD_PYTHON_VERSION_38 && \ pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \ pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \ @@ -232,6 +241,7 @@ LABEL python.version_35=$PYTHON_VERSION_35 LABEL python.version_36=$PYTHON_VERSION_36 LABEL python.version_37=$PYTHON_VERSION_37 LABEL python.version_38=$PYTHON_VERSION_38 +LABEL python.version_38=$PYTHON_VERSION_39 LABEL python.pip=$_PIP_VERSION LABEL python.setuptools=$SETUPTOOLS_VERSION LABEL python.virtualenv=$VIRTUALENV_VERSION From 5d0847b7305645a58948e76f64b9427df1ff54ed Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 27 Aug 2020 11:57:35 +0200 Subject: [PATCH 3/9] Update readme mentioning 8.0 --- README.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index 0272efe..5e7fab8 100644 --- a/README.rst +++ b/README.rst @@ -24,19 +24,19 @@ repository: **Deprecated** Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7. -`readthedocs/build:5.0` +`readthedocs/build:6.0` ``stable`` - Ubuntu 18.04 supporting Python 2.7, 3.6, 3.7 and pypy3.5-7.0.0. + Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. This is the **stable** image supported by Read the Docs. -`readthedocs/build:6.0` +`readthedocs/build:7.0` ``latest`` Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. This is the **latest** default image used for documentation builds and supported by Read the Docs. -`readthedocs/build:7.0` +`readthedocs/build:8.0` ``testing`` - Ubuntu 18.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8 and PyPy3.5-7.0.0. + Ubuntu 20.04 supporting Python 2.7, 3.5, 3.6, 3.7, 3.8, 3.9.0rc1 and PyPy3.5-7.0.0. For internal development **testing** only, not available for public usage yet. .. _readthedocs/build: https://hub.docker.com/r/readthedocs/build/ From 295ef2dc70718c1ef6480552129a3d5b9d19b479 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 27 Aug 2020 12:29:24 +0200 Subject: [PATCH 4/9] Do not install python-pip It does not exist anymore in 20.04 --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index eda9d0c..9c24231 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,9 +115,7 @@ RUN apt-get -y install \ # Install Python tools/libs ENV RTD_VIRTUALENV_VERSION 16.7.9 -RUN apt-get -y install \ - python-pip \ - && pip install -U \ +RUN pip install -U \ auxlib \ virtualenv==$RTD_VIRTUALENV_VERSION From e1d071b4c9249da2517dd3961a573049fe278a5d Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 31 Aug 2020 17:33:49 +0200 Subject: [PATCH 5/9] Revert "Do not install python-pip" This reverts commit ffc56102e51e2dd98d87f1e1090fb7adece4c709. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9c24231..eda9d0c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -115,7 +115,9 @@ RUN apt-get -y install \ # Install Python tools/libs ENV RTD_VIRTUALENV_VERSION 16.7.9 -RUN pip install -U \ +RUN apt-get -y install \ + python-pip \ + && pip install -U \ auxlib \ virtualenv==$RTD_VIRTUALENV_VERSION From 7758def9c72cefd230fb605cb8b29c264be9ff1b Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 31 Aug 2020 17:35:05 +0200 Subject: [PATCH 6/9] Install python3-pip --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index eda9d0c..4139d60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,8 +116,8 @@ RUN apt-get -y install \ # Install Python tools/libs ENV RTD_VIRTUALENV_VERSION 16.7.9 RUN apt-get -y install \ - python-pip \ - && pip install -U \ + python3-pip \ + && pip3 install -U \ auxlib \ virtualenv==$RTD_VIRTUALENV_VERSION From f4ec9d22a3f6f0d6726affe607bda92706942731 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Mon, 31 Aug 2020 19:17:58 +0200 Subject: [PATCH 7/9] Do not install Python dependencies on Py 3.9 --- Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4139d60..4dde0a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -185,9 +185,7 @@ ENV RTD_PIP_VERSION 20.0.1 ENV RTD_SETUPTOOLS_VERSION 45.1.0 RUN pyenv local $RTD_PYTHON_VERSION_39 && \ pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \ - pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \ - pyenv exec pip install --no-cache-dir --only-binary numpy numpy && \ - pyenv exec pip install --no-cache-dir pandas matplotlib virtualenv==$RTD_VIRTUALENV_VERSION + pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION RUN pyenv local $RTD_PYTHON_VERSION_38 && \ pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \ From c855249045228cad7a93b60ffe309243aaa90e25 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Tue, 1 Sep 2020 10:07:36 +0200 Subject: [PATCH 8/9] Install virtualenv in Python 3.9rc1 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4dde0a6..755f232 100644 --- a/Dockerfile +++ b/Dockerfile @@ -185,7 +185,8 @@ ENV RTD_PIP_VERSION 20.0.1 ENV RTD_SETUPTOOLS_VERSION 45.1.0 RUN pyenv local $RTD_PYTHON_VERSION_39 && \ pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \ - pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION + pyenv exec pip install --no-cache-dir -U setuptools==$RTD_SETUPTOOLS_VERSION && \ + pyenv exec pip install --no-cache-dir virtualenv==$RTD_VIRTUALENV_VERSION RUN pyenv local $RTD_PYTHON_VERSION_38 && \ pyenv exec pip install --no-cache-dir -U pip==$RTD_PIP_VERSION && \ From 7239b0fbbd14893155a9ed31547cc36aa9d59c33 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 24 Sep 2020 11:13:28 +0200 Subject: [PATCH 9/9] Update Dockerfile Co-authored-by: Anthony --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 755f232..85e8236 100644 --- a/Dockerfile +++ b/Dockerfile @@ -116,8 +116,8 @@ RUN apt-get -y install \ # Install Python tools/libs ENV RTD_VIRTUALENV_VERSION 16.7.9 RUN apt-get -y install \ - python3-pip \ - && pip3 install -U \ + python3-pip && \ + pip3 install -U \ auxlib \ virtualenv==$RTD_VIRTUALENV_VERSION