From a403a0071c68ff2d3d65e47c5896ef160e86145b Mon Sep 17 00:00:00 2001 From: Oliver Steele Date: Sun, 17 Jun 2018 20:22:41 -0400 Subject: [PATCH 1/7] Update CONDA_VERSION Fixes #68 --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9f9c778..0c7ede3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV LANG C.UTF-8 ENV PYTHON_VERSION_27 2.7.14 ENV PYTHON_VERSION_35 3.5.5 ENV PYTHON_VERSION_36 3.6.4 -ENV CONDA_VERSION 4.4.10 +ENV CONDA_VERSION 4.5.4 LABEL python.version_27=$PYTHON_VERSION_27 LABEL python.version_35=$PYTHON_VERSION_35 LABEL python.version_36=$PYTHON_VERSION_36 @@ -77,9 +77,9 @@ RUN pyenv install $PYTHON_VERSION_27 && \ pyenv install $PYTHON_VERSION_36 && \ pyenv install $PYTHON_VERSION_35 && \ pyenv global \ - $PYTHON_VERSION_27 \ - $PYTHON_VERSION_36 \ - $PYTHON_VERSION_35 + $PYTHON_VERSION_27 \ + $PYTHON_VERSION_36 \ + $PYTHON_VERSION_35 WORKDIR /tmp From 732f685653f5a44e966ba6efaad27d40d92ca576 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 8 Oct 2018 20:40:26 +0100 Subject: [PATCH 2/7] Revert unwanted change --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0c7ede3..fc0d109 100644 --- a/Dockerfile +++ b/Dockerfile @@ -77,9 +77,9 @@ RUN pyenv install $PYTHON_VERSION_27 && \ pyenv install $PYTHON_VERSION_36 && \ pyenv install $PYTHON_VERSION_35 && \ pyenv global \ - $PYTHON_VERSION_27 \ - $PYTHON_VERSION_36 \ - $PYTHON_VERSION_35 + $PYTHON_VERSION_27 \ + $PYTHON_VERSION_36 \ + $PYTHON_VERSION_35 WORKDIR /tmp From 3c06f6461ac79135cb5fabab5533b42c457dc3cf Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 8 Oct 2018 20:55:35 +0100 Subject: [PATCH 3/7] Update conda to the latest version 4.5.11 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fc0d109..a6ecbb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV LANG C.UTF-8 ENV PYTHON_VERSION_27 2.7.14 ENV PYTHON_VERSION_35 3.5.5 ENV PYTHON_VERSION_36 3.6.4 -ENV CONDA_VERSION 4.5.4 +ENV CONDA_VERSION 4.5.11 LABEL python.version_27=$PYTHON_VERSION_27 LABEL python.version_35=$PYTHON_VERSION_35 LABEL python.version_36=$PYTHON_VERSION_36 From 102d84691c2cfe3ac32b4e41aa245846604a722d Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 8 Oct 2018 20:11:21 +0100 Subject: [PATCH 4/7] Add Python 3.7 to the Docker image --- Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfile b/Dockerfile index a6ecbb0..f8f4daf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,10 +11,12 @@ ENV LANG C.UTF-8 ENV PYTHON_VERSION_27 2.7.14 ENV PYTHON_VERSION_35 3.5.5 ENV PYTHON_VERSION_36 3.6.4 +ENV PYTHON_VERSION_37 3.7.0 ENV CONDA_VERSION 4.5.11 LABEL python.version_27=$PYTHON_VERSION_27 LABEL python.version_35=$PYTHON_VERSION_35 LABEL python.version_36=$PYTHON_VERSION_36 +LABEL python.version_37=$PYTHON_VERSION_37 LABEL conda.version=$CONDA_VERSION # System dependencies @@ -74,10 +76,12 @@ ENV PATH /home/docs/.pyenv/shims:$PATH:/home/docs/.pyenv/bin # Install supported Python versions RUN pyenv install $PYTHON_VERSION_27 && \ + pyenv install $PYTHON_VERSION_37 && \ pyenv install $PYTHON_VERSION_36 && \ pyenv install $PYTHON_VERSION_35 && \ pyenv global \ $PYTHON_VERSION_27 \ + $PYTHON_VERSION_37 \ $PYTHON_VERSION_36 \ $PYTHON_VERSION_35 @@ -88,6 +92,12 @@ RUN pyenv local $PYTHON_VERSION_27 && \ pyenv exec pip install --only-binary numpy,scipy numpy scipy && \ pyenv exec pip install pandas matplotlib virtualenv +RUN pyenv local $PYTHON_VERSION_37 && \ + pyenv exec pip install -U pip && \ + pyenv exec pip install --only-binary numpy,scipy numpy scipy && \ + pyenv exec pip install pandas matplotlib virtualenv + pyenv exec pip install pandas matplotlib virtualenv + RUN pyenv local $PYTHON_VERSION_36 && \ pyenv exec pip install -U pip && \ pyenv exec pip install --only-binary numpy,scipy numpy scipy && \ From 265339ed1a30f8669058a4d59937662b125f1c8a Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Mon, 8 Oct 2018 20:12:15 +0100 Subject: [PATCH 5/7] Add Python 3.7 to the README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0b2221d..49bc2d3 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ repositoryr: `readthedocs/build:4.0rc1` **testing** - Ubuntu 18.04 release candidate supporting Python 2.7, 3.5, 3.6. For internal + Ubuntu 18.04 release candidate supporting Python 2.7, 3.5, 3.6, 3.7. For internal development **testing** only, not available for public usage yet. .. _readthedocs/build: https://hub.docker.com/r/readthedocs/build/ From 479a5d9edb7af934be09f28fdbe4aa8d05836e08 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Sun, 21 Oct 2018 09:23:33 +0000 Subject: [PATCH 6/7] Update Python 3.7.x to 3.7.1 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f8f4daf..8df33ee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ ENV LANG C.UTF-8 ENV PYTHON_VERSION_27 2.7.14 ENV PYTHON_VERSION_35 3.5.5 ENV PYTHON_VERSION_36 3.6.4 -ENV PYTHON_VERSION_37 3.7.0 +ENV PYTHON_VERSION_37 3.7.1 ENV CONDA_VERSION 4.5.11 LABEL python.version_27=$PYTHON_VERSION_27 LABEL python.version_35=$PYTHON_VERSION_35 From 7af8cdb06e33827dd560527016be3367ba8a2c14 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Tue, 6 Nov 2018 09:41:19 +0100 Subject: [PATCH 7/7] Remove duplicated line --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8df33ee..796f2f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,7 +96,6 @@ RUN pyenv local $PYTHON_VERSION_37 && \ pyenv exec pip install -U pip && \ pyenv exec pip install --only-binary numpy,scipy numpy scipy && \ pyenv exec pip install pandas matplotlib virtualenv - pyenv exec pip install pandas matplotlib virtualenv RUN pyenv local $PYTHON_VERSION_36 && \ pyenv exec pip install -U pip && \