Merge pull request #61 from infosiftr/pin-setuptools

Pin setuptools to 44.x

Author: yosifkit

2.7/bullseye/Dockerfile

@@ -132,6 +132,8 @@ RUN set -eux; \
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION {{ .pip.version }}
+# https://github.com/docker-library/python/issues/365
+ENV PYTHON_SETUPTOOLS_VERSION {{ .setuptools.version }}
 # https://github.com/pypa/get-pip
 ENV PYTHON_GET_PIP_URL {{ ."get-pip".url }}
 ENV PYTHON_GET_PIP_SHA256 {{ ."get-pip".sha256 }}
@@ -150,6 +152,7 @@ RUN set -ex; \
 		--disable-pip-version-check \
 		--no-cache-dir \
 		"pip == $PYTHON_PIP_VERSION" \
+		"setuptools == $PYTHON_SETUPTOOLS_VERSION" \
 	; \
 {{ if is_slim then ( -}}
 	apt-get purge -y --auto-remove wget; \

2.7/buster/Dockerfile

@@ -88,6 +88,8 @@ RUN $url = '{{ .arches["windows-amd64"].url }}'; \
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
 ENV PYTHON_PIP_VERSION {{ .pip.version }}
+# https://github.com/docker-library/python/issues/365
+ENV PYTHON_SETUPTOOLS_VERSION {{ .setuptools.version }}
 # https://github.com/pypa/get-pip
 ENV PYTHON_GET_PIP_URL {{ ."get-pip".url }}
 ENV PYTHON_GET_PIP_SHA256 {{ ."get-pip".sha256 }}
@@ -106,6 +108,7 @@ RUN Write-Host ('Downloading get-pip.py ({0}) ...' -f $env:PYTHON_GET_PIP_URL);
 		--disable-pip-version-check \
 		--no-cache-dir \
 		('pip == {0}' -f $env:PYTHON_PIP_VERSION) \
+		('setuptools == {0}' -f $env:PYTHON_SETUPTOOLS_VERSION) \
 	; \
 	Remove-Item get-pip.py -Force; \
 	\

2.7/slim-bullseye/Dockerfile

@@ -26,6 +26,9 @@
     "pip": {
       "version": "20.3.4"
     },
+    "setuptools": {
+      "version": "44.1.1"
+    },
     "variants": [
       "bullseye",
       "slim-bullseye",
@@ -66,6 +69,9 @@
     "pip": {
       "version": "20.3.4"
     },
+    "setuptools": {
+      "version": "44.1.1"
+    },
     "variants": [
       "bullseye",
       "slim-bullseye",

2.7/slim-buster/Dockerfile

@@ -27,20 +27,28 @@ fi
 versions=( "${versions[@]%/}" )
 
 pipVersion="$(
-	curl -fsSL 'https://pypi.org/pypi/pip/json' \
-		| jq -r '
-			.releases
-			| keys[]
-			# version 20.x is the last to support Python 2
-			| select(startswith("20."))
-		' \
-		| sort -rV \
-		| head -1
+	curl -fsSL 'https://pypi.org/pypi/pip/json' | jq -r '
+		.releases
+		| keys_unsorted
+		# version 20.x is the last to support Python 2
+		| map(select(startswith("20.") and (test("[^0-9.]") | not)))
+		| max_by(split(".") | map(tonumber))
+	'
+)"
+# https://github.com/docker-library/python/issues/365
+setuptoolsVersion="$(
+	curl -fsSL 'https://pypi.org/pypi/setuptools/json' | jq -r '
+		.releases
+		| keys_unsorted
+		# version 44.x is the last to support Python 2
+		| map(select(startswith("44.")))
+		| max_by(split(".") | map(tonumber))
+	'
 )"
 getPipCommit="$(curl -fsSL "https://github.com/pypa/get-pip/commits/$pipVersion/get-pip.py.atom" | tac|tac | awk -F '[[:space:]]*[<>/]+' '$2 == "id" && $3 ~ /Commit/ { print $4; exit }')"
 getPipUrl="https://github.com/pypa/get-pip/raw/$getPipCommit/get-pip.py"
 getPipSha256="$(curl -fsSL "$getPipUrl" | sha256sum | cut -d' ' -f1)"
-export pipVersion getPipCommit getPipUrl getPipSha256
+export pipVersion setuptoolsVersion getPipCommit getPipUrl getPipSha256
 
 sha256s="$(curl -fsSL --compressed 'https://www.pypy.org/checksums.html')"
 pypy_tarball() {
@@ -106,6 +114,7 @@ for version in "${versions[@]}"; do
 				},
 			},
 			pip: { version: env.pipVersion },
+			setuptools: { version: env.setuptoolsVersion },
 			"get-pip": {
 				version: env.getPipCommit,
 				sha256: env.getPipSha256,