From e4cfc4299e8b5ea35257d5daf3f93aaf94df0230 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Thu, 28 Jun 2018 14:44:38 +0800 Subject: [PATCH 1/3] Update 3.7.0b5 to 3.7.0 --- .travis.yml | 6 +++--- {3.7-rc => 3.7}/alpine3.7/Dockerfile | 2 +- {3.7-rc => 3.7}/stretch/Dockerfile | 2 +- {3.7-rc => 3.7}/stretch/slim/Dockerfile | 2 +- {3.7-rc => 3.7}/windows/windowsservercore-1709/Dockerfile | 2 +- .../windows/windowsservercore-ltsc2016/Dockerfile | 2 +- generate-stackbrew-library.sh | 5 +++-- 7 files changed, 11 insertions(+), 10 deletions(-) rename {3.7-rc => 3.7}/alpine3.7/Dockerfile (99%) rename {3.7-rc => 3.7}/stretch/Dockerfile (99%) rename {3.7-rc => 3.7}/stretch/slim/Dockerfile (99%) rename {3.7-rc => 3.7}/windows/windowsservercore-1709/Dockerfile (98%) rename {3.7-rc => 3.7}/windows/windowsservercore-ltsc2016/Dockerfile (98%) diff --git a/.travis.yml b/.travis.yml index 0ec08608c..39c75af1e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,9 @@ language: bash services: docker env: - - VERSION=3.7-rc VARIANT=stretch - - VERSION=3.7-rc VARIANT=stretch/slim - - VERSION=3.7-rc VARIANT=alpine3.7 + - VERSION=3.7 VARIANT=stretch + - VERSION=3.7 VARIANT=stretch/slim + - VERSION=3.7 VARIANT=alpine3.7 - VERSION=3.6 VARIANT=stretch - VERSION=3.6 VARIANT=stretch/slim - VERSION=3.6 VARIANT=jessie diff --git a/3.7-rc/alpine3.7/Dockerfile b/3.7/alpine3.7/Dockerfile similarity index 99% rename from 3.7-rc/alpine3.7/Dockerfile rename to 3.7/alpine3.7/Dockerfile index aa0cd9ebc..e49f25221 100644 --- a/3.7-rc/alpine3.7/Dockerfile +++ b/3.7/alpine3.7/Dockerfile @@ -18,7 +18,7 @@ ENV LANG C.UTF-8 RUN apk add --no-cache ca-certificates ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D -ENV PYTHON_VERSION 3.7.0b5 +ENV PYTHON_VERSION 3.7.0 RUN set -ex \ && apk add --no-cache --virtual .fetch-deps \ diff --git a/3.7-rc/stretch/Dockerfile b/3.7/stretch/Dockerfile similarity index 99% rename from 3.7-rc/stretch/Dockerfile rename to 3.7/stretch/Dockerfile index 559f9b293..773a0435c 100644 --- a/3.7-rc/stretch/Dockerfile +++ b/3.7/stretch/Dockerfile @@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D -ENV PYTHON_VERSION 3.7.0b5 +ENV PYTHON_VERSION 3.7.0 RUN set -ex \ && buildDeps=' \ diff --git a/3.7-rc/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile similarity index 99% rename from 3.7-rc/stretch/slim/Dockerfile rename to 3.7/stretch/slim/Dockerfile index b9c0bdd2d..00465dbae 100644 --- a/3.7-rc/stretch/slim/Dockerfile +++ b/3.7/stretch/slim/Dockerfile @@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ && rm -rf /var/lib/apt/lists/* ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D -ENV PYTHON_VERSION 3.7.0b5 +ENV PYTHON_VERSION 3.7.0 RUN set -ex \ && buildDeps=" \ diff --git a/3.7-rc/windows/windowsservercore-1709/Dockerfile b/3.7/windows/windowsservercore-1709/Dockerfile similarity index 98% rename from 3.7-rc/windows/windowsservercore-1709/Dockerfile rename to 3.7/windows/windowsservercore-1709/Dockerfile index 232f0cdd5..f5ef9a814 100644 --- a/3.7-rc/windows/windowsservercore-1709/Dockerfile +++ b/3.7/windows/windowsservercore-1709/Dockerfile @@ -8,7 +8,7 @@ FROM microsoft/windowsservercore:1709 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV PYTHON_VERSION 3.7.0b5 +ENV PYTHON_VERSION 3.7.0 ENV PYTHON_RELEASE 3.7.0 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \ diff --git a/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile b/3.7/windows/windowsservercore-ltsc2016/Dockerfile similarity index 98% rename from 3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile rename to 3.7/windows/windowsservercore-ltsc2016/Dockerfile index 2f91dd54c..27eaccfae 100644 --- a/3.7-rc/windows/windowsservercore-ltsc2016/Dockerfile +++ b/3.7/windows/windowsservercore-ltsc2016/Dockerfile @@ -8,7 +8,7 @@ FROM microsoft/windowsservercore:ltsc2016 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] -ENV PYTHON_VERSION 3.7.0b5 +ENV PYTHON_VERSION 3.7.0 ENV PYTHON_RELEASE 3.7.0 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \ diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index 47a396d86..a2d124d65 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -2,8 +2,9 @@ set -Eeuo pipefail declare -A aliases=( - [3.7-rc]='rc' - [3.6]='3 latest' + [3.8-rc]='rc' + [3.7]='3 latest' + [3.6]='3.6' [2.7]='2' ) From 3232a0d4ba409e731c27981cf1802d8e8e15a245 Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Thu, 28 Jun 2018 14:55:25 +0800 Subject: [PATCH 2/3] fix appveyor matrix --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 086d68859..ec4130ac2 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -3,7 +3,7 @@ image: Visual Studio 2017 environment: matrix: - - version: 3.7-rc + - version: 3.7 variant: windowsservercore-ltsc2016 - version: 3.6 variant: windowsservercore-ltsc2016 From 2a79ecbdfdb736297c39bcae664aee0e6b01bd5c Mon Sep 17 00:00:00 2001 From: Jintao Zhang Date: Fri, 29 Jun 2018 16:06:51 +0800 Subject: [PATCH 3/3] remove redundant alias for 3.6 --- generate-stackbrew-library.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index a2d124d65..b7fbf96be 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -4,7 +4,6 @@ set -Eeuo pipefail declare -A aliases=( [3.8-rc]='rc' [3.7]='3 latest' - [3.6]='3.6' [2.7]='2' )