Skip to content

Commit ff1be93

Browse files
mattrobenoltmattrobenolt
committed
pip 8.0.3
1 parent d5cf1e3 commit ff1be93

File tree

17 files changed

+22
-16
lines changed

17 files changed

+22
-16
lines changed

‎2.7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
1313
ENV PYTHON_VERSION 2.7.11
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎2.7/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
1010
ENV PYTHON_VERSION 2.7.11
1111

1212
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
13-
ENV PYTHON_PIP_VERSION 7.1.2
13+
ENV PYTHON_PIP_VERSION 8.0.3
1414

1515
RUN set -ex \
1616
&& apk add --no-cache --virtual .fetch-deps curl gnupg \

‎2.7/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
1919
ENV PYTHON_VERSION 2.7.11
2020

2121
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
22-
ENV PYTHON_PIP_VERSION 7.1.2
22+
ENV PYTHON_PIP_VERSION 8.0.3
2323

2424
RUN set -ex \
2525
&& buildDeps=' \

‎2.7/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF
1313
ENV PYTHON_VERSION 2.7.11
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎3.2/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
1313
ENV PYTHON_VERSION 3.2.6
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16+
# NOTE: pip >= 8.0.0 is not compatible with python 3.2
1617
ENV PYTHON_PIP_VERSION 7.1.2
1718

1819
RUN set -ex \

‎3.3/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
1313
ENV PYTHON_VERSION 3.3.6
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎3.3/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
1010
ENV PYTHON_VERSION 3.3.6
1111

1212
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
13-
ENV PYTHON_PIP_VERSION 7.1.2
13+
ENV PYTHON_PIP_VERSION 8.0.3
1414

1515
RUN set -ex \
1616
&& apk add --no-cache --virtual .fetch-deps curl gnupg \

‎3.3/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
1919
ENV PYTHON_VERSION 3.3.6
2020

2121
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
22-
ENV PYTHON_PIP_VERSION 7.1.2
22+
ENV PYTHON_PIP_VERSION 8.0.3
2323

2424
RUN set -ex \
2525
&& buildDeps=' \

‎3.3/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY 26DEA9D4613391EF3E25C9FF0A5B101836580288
1313
ENV PYTHON_VERSION 3.3.6
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎3.4/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1313
ENV PYTHON_VERSION 3.4.4
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎3.4/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1010
ENV PYTHON_VERSION 3.4.4
1111

1212
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
13-
ENV PYTHON_PIP_VERSION 7.1.2
13+
ENV PYTHON_PIP_VERSION 8.0.3
1414

1515
RUN set -ex \
1616
&& apk add --no-cache --virtual .fetch-deps curl gnupg \

‎3.4/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1919
ENV PYTHON_VERSION 3.4.4
2020

2121
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
22-
ENV PYTHON_PIP_VERSION 7.1.2
22+
ENV PYTHON_PIP_VERSION 8.0.3
2323

2424
RUN set -ex \
2525
&& buildDeps=' \

‎3.4/wheezy/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1313
ENV PYTHON_VERSION 3.4.4
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎3.5/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1313
ENV PYTHON_VERSION 3.5.1
1414

1515
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
16-
ENV PYTHON_PIP_VERSION 7.1.2
16+
ENV PYTHON_PIP_VERSION 8.0.3
1717

1818
RUN set -ex \
1919
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys "$GPG_KEY" \

‎3.5/alpine/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1010
ENV PYTHON_VERSION 3.5.1
1111

1212
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
13-
ENV PYTHON_PIP_VERSION 7.1.2
13+
ENV PYTHON_PIP_VERSION 8.0.3
1414

1515
RUN set -ex \
1616
&& apk add --no-cache --virtual .fetch-deps curl gnupg \

‎3.5/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ ENV GPG_KEY 97FC712E4C024BBEA48A61ED3A5CA953F73C700D
1919
ENV PYTHON_VERSION 3.5.1
2020

2121
# if this is called "PIP_VERSION", pip explodes with "ValueError: invalid truth value '<VERSION>'"
22-
ENV PYTHON_PIP_VERSION 7.1.2
22+
ENV PYTHON_PIP_VERSION 8.0.3
2323

2424
RUN set -ex \
2525
&& buildDeps=' \

‎update.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ for version in "${versions[@]}"; do
2525
set -x
2626
sed -ri '
2727
s/^(ENV PYTHON_VERSION) .*/\1 '"$fullVersion"'/;
28-
s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/;
2928
' "$version"/{,*/}Dockerfile
29+
# Starting with pip 8.0, support for python 3.2 has been dropped
30+
if [ "$version" != "3.2" ]; then
31+
sed -ri '
32+
s/^(ENV PYTHON_PIP_VERSION) .*/\1 '"$pipVersion"'/;
33+
' "$version"/{,*/}Dockerfile
34+
fi
3035
sed -ri 's/^(FROM python):.*/\1:'"$version"'/' "$version/onbuild/Dockerfile"
3136
)
3237
for variant in wheezy alpine slim; do

0 commit comments

Comments
 (0)