pip 8.0.0

mattrobenolt · mattrobenolt · commit 8aaf11a3696f · 2016-01-19T17:47:50.000-08:00
diff --git a/2.7/Dockerfile b/2.7/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 ENV PYTHON_VERSION 2.7.11
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile
@@ -10,7 +10,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 ENV PYTHON_VERSION 2.7.11
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
diff --git a/2.7/slim/Dockerfile b/2.7/slim/Dockerfile
@@ -19,7 +19,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 ENV PYTHON_VERSION 2.7.11
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& buildDeps=' \
diff --git a/2.7/wheezy/Dockerfile b/2.7/wheezy/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
 ENV PYTHON_VERSION 2.7.11
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/3.2/Dockerfile b/3.2/Dockerfile
@@ -13,6 +13,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
 ENV PYTHON_VERSION 3.2.6
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
+# NOTE: pip >= 8.0.0 is not compatible with python 3.2
 ENV PYTHON_PIP_VERSION 7.1.2
 
 RUN set -ex \
diff --git a/3.3/Dockerfile b/3.3/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
 ENV PYTHON_VERSION 3.3.6
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/3.3/alpine/Dockerfile b/3.3/alpine/Dockerfile
@@ -10,7 +10,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
 ENV PYTHON_VERSION 3.3.6
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
diff --git a/3.3/slim/Dockerfile b/3.3/slim/Dockerfile
@@ -19,7 +19,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
 ENV PYTHON_VERSION 3.3.6
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& buildDeps=' \
diff --git a/3.3/wheezy/Dockerfile b/3.3/wheezy/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
 ENV PYTHON_VERSION 3.3.6
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/3.4/Dockerfile b/3.4/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.4.4
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/3.4/alpine/Dockerfile b/3.4/alpine/Dockerfile
@@ -10,7 +10,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.4.4
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
diff --git a/3.4/slim/Dockerfile b/3.4/slim/Dockerfile
@@ -19,7 +19,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.4.4
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& buildDeps=' \
diff --git a/3.4/wheezy/Dockerfile b/3.4/wheezy/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.4.4
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/3.5/Dockerfile b/3.5/Dockerfile
@@ -13,7 +13,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.5.1
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \
diff --git a/3.5/alpine/Dockerfile b/3.5/alpine/Dockerfile
@@ -10,7 +10,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.5.1
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& apk add --no-cache --virtual .fetch-deps curl gnupg \
diff --git a/3.5/slim/Dockerfile b/3.5/slim/Dockerfile
@@ -19,7 +19,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
 ENV PYTHON_VERSION 3.5.1
 
 # if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
-ENV PYTHON_PIP_VERSION 7.1.2
+ENV PYTHON_PIP_VERSION 8.0.0
 
 RUN set -ex \
 	&& buildDeps=' \
diff --git a/update.sh b/update.sh
@@ -25,8 +25,13 @@ for version in "${versions[@]}"; do
 		set -x
 		sed -ri '
 			s/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/;
-			s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/;
 		' "$version"/{,*/}Dockerfile
+		# Starting with pip 8.0, support for python 3.2 has been dropped
+		if [ "$version" != "3.2" ]; then
+			sed -ri '
+				s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/;
+			' "$version"/{,*/}Dockerfile
+		fi
 		sed -ri 's/^(FROM python):.*/\1:'"$version"'/' "$version/onbuild/Dockerfile"
 	)
 	for variant in wheezy alpine slim; do
