Revert back to 3.8.3 and fix update.sh to wait for Windows binaries before bumping

tianon · tianon · commit ed9306a6c19c · 2020-07-13T10:24:58.000-07:00
diff --git a/3.8/alpine3.11/Dockerfile b/3.8/alpine3.11/Dockerfile
@@ -18,7 +18,7 @@ ENV LANG C.UTF-8
 RUN apk add --no-cache ca-certificates
 
 ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568
-ENV PYTHON_VERSION 3.8.4
+ENV PYTHON_VERSION 3.8.3
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps \
diff --git a/3.8/alpine3.12/Dockerfile b/3.8/alpine3.12/Dockerfile
@@ -18,7 +18,7 @@ ENV LANG C.UTF-8
 RUN apk add --no-cache ca-certificates
 
 ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568
-ENV PYTHON_VERSION 3.8.4
+ENV PYTHON_VERSION 3.8.3
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps \
diff --git a/3.8/buster/Dockerfile b/3.8/buster/Dockerfile
@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568
-ENV PYTHON_VERSION 3.8.4
+ENV PYTHON_VERSION 3.8.3
 
 RUN set -ex \
 	\
diff --git a/3.8/buster/slim/Dockerfile b/3.8/buster/slim/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 E3FF2839C048B25C084DEBE9B26995E310250568
-ENV PYTHON_VERSION 3.8.4
+ENV PYTHON_VERSION 3.8.3
 
 RUN set -ex \
 	\
diff --git a/3.8/windows/windowsservercore-1809/Dockerfile b/3.8/windows/windowsservercore-1809/Dockerfile
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/windows/servercore:1809
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV PYTHON_VERSION 3.8.4
-ENV PYTHON_RELEASE 3.8.4
+ENV PYTHON_VERSION 3.8.3
+ENV PYTHON_RELEASE 3.8.3
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
diff --git a/3.8/windows/windowsservercore-ltsc2016/Dockerfile b/3.8/windows/windowsservercore-ltsc2016/Dockerfile
@@ -8,8 +8,8 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2016
 
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ENV PYTHON_VERSION 3.8.4
-ENV PYTHON_RELEASE 3.8.4
+ENV PYTHON_VERSION 3.8.3
+ENV PYTHON_RELEASE 3.8.3
 
 RUN $url = ('https://www.python.org/ftp/python/{0}/python-{1}-amd64.exe' -f $env:PYTHON_RELEASE, $env:PYTHON_VERSION); \
 	Write-Host ('Downloading {0} ...' -f $url); \
diff --git a/update.sh b/update.sh
@@ -49,6 +49,22 @@ generated_warning() {
 	EOH
 }
 
+is_good_version() {
+	local dir="$1"; shift
+	local dirVersion="$1"; shift
+	local fullVersion="$1"; shift
+
+	if ! wget -q -O /dev/null -o /dev/null --spider "https://www.python.org/ftp/python/$dirVersion/Python-$fullVersion.tar.xz"; then
+		return 1
+	fi
+
+	if [ -d "$dir/windows" ] && ! wget -q -O /dev/null -o /dev/null --spider "https://www.python.org/ftp/python/$dirVersion/python-$fullVersion-amd64.exe"; then
+		return 1
+	fi
+
+	return 0
+}
+
 for version in "${versions[@]}"; do
 	rcVersion="${version%-rc}"
 	rcGrepV='-v'
@@ -76,8 +92,8 @@ for version in "${versions[@]}"; do
 	for possible in "${possibles[@]}"; do
 		rcPossible="${possible%%[a-z]*}"
 
-		# varnish is great until it isn't
-		if wget -q -O /dev/null -o /dev/null --spider "https://www.python.org/ftp/python/$rcPossible/Python-$possible.tar.xz"; then
+		# varnish is great until it isn't (usually the directory listing we scrape below is updated/uncached significantly later than the release being available)
+		if is_good_version "$version" "$rcPossible" "$possible"; then
 			fullVersion="$possible"
 			break
 		fi
@@ -94,10 +110,12 @@ for version in "${versions[@]}"; do
 				| sort -rV \
 				|| true
 		) )
-		if [ "${#possibleVersions[@]}" -gt 0 ]; then
-			fullVersion="${possibleVersions[0]}"
-			break
-		fi
+		for possibleVersion in "${possibleVersions[@]}"; do
+			if is_good_version "$version" "$rcPossible" "$possibleVersion"; then
+				fullVersion="$possibleVersion"
+				break
+			fi
+		done
 	done
 
 	if [ -z "$fullVersion" ]; then

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \`
`21`	`21`	`&& rm -rf /var/lib/apt/lists/*`
`22`	`22`
`23`	`23`	`ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568`
`24`		`-ENV PYTHON_VERSION 3.8.4`
	`24`	`+ENV PYTHON_VERSION 3.8.3`
`25`	`25`
`26`	`26`	`RUN set -ex \`
`27`	`27`	`\`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \`
`20`	`20`	`&& rm -rf /var/lib/apt/lists/*`
`21`	`21`
`22`	`22`	`ENV GPG_KEY E3FF2839C048B25C084DEBE9B26995E310250568`
`23`		`-ENV PYTHON_VERSION 3.8.4`
	`23`	`+ENV PYTHON_VERSION 3.8.3`
`24`	`24`
`25`	`25`	`RUN set -ex \`
`26`	`26`	`\`