Merge pull request #326 from JayH5/py3.7-uuid

Python 3.7: Install libuuid packages for native _uuid module

Author: tianon

3.7/alpine3.7/Dockerfile

@@ -59,6 +59,7 @@ RUN set -ex \
 		tcl-dev \
 		tk \
 		tk-dev \
+		util-linux-dev \
 		xz-dev \
 		zlib-dev \
 # add build deps before removing fetch deps in case there's overlap

3.7/alpine3.8/Dockerfile

@@ -59,6 +59,7 @@ RUN set -ex \
 		tcl-dev \
 		tk \
 		tk-dev \
+		util-linux-dev \
 		xz-dev \
 		zlib-dev \
 # add build deps before removing fetch deps in case there's overlap

3.7/stretch/Dockerfile

@@ -16,6 +16,7 @@ ENV LANG C.UTF-8
 # extra dependencies (over what buildpack-deps already includes)
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		tk-dev \
+		uuid-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY 0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D

3.7/stretch/slim/Dockerfile

@@ -40,6 +40,7 @@ RUN set -ex \
 		libssl-dev \
 		make \
 		tk-dev \
+		uuid-dev \
 		wget \
 		xz-utils \
 		zlib1g-dev \

Dockerfile-alpine.template

@@ -55,6 +55,7 @@ RUN set -ex \
 		tcl-dev \
 		tk \
 		tk-dev \
+		util-linux-dev \
 		xz-dev \
 		zlib-dev \
 # add build deps before removing fetch deps in case there's overlap

Dockerfile-debian.template

@@ -12,6 +12,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 # Python 3.4 on Stretch+ needs to use an older version of "libssl-dev" (these lines both get removed for every other combination)
 		libssl-dev \
 		tk-dev \
+		uuid-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GPG_KEY %%PLACEHOLDER%%

Dockerfile-slim.template

@@ -34,6 +34,7 @@ RUN set -ex \
 		libssl-dev \
 		make \
 		tk-dev \
+		uuid-dev \
 		wget \
 		xz-utils \
 		zlib1g-dev \

update.sh

@@ -174,9 +174,18 @@ for version in "${versions[@]}"; do
 				;;& # (3.5*/alpine* needs to match the next block too)
 			# Libraries to build the nis module only available in Alpine 3.7+.
 			# Also require this patch https://bugs.python.org/issue32521 only available in Python 2.7, 3.6+.
-			3.4*/alpine* | 3.5*/alpine* | */alpine3.6)
+			3.[4-5]*/alpine* | */alpine3.6)
 				sed -ri -e '/libnsl-dev/d' -e '/libtirpc-dev/d' "$dir/Dockerfile"
+				;;& # (3.4*/alpine* and 3.5*/alpine* need to match the next block too)
+			# https://bugs.python.org/issue11063, https://bugs.python.org/issue20519 (Python 3.7.0+)
+			# A new native _uuid module improves uuid import time and avoids using ctypes.
+			# This requires the development libuuid headers.
+			3.[4-6]*/alpine*)
+				sed -ri -e '/util-linux-dev/d' "$dir/Dockerfile"
 				;;
+			3.[4-6]*)
+				sed -ri -e '/uuid-dev/d' "$dir/Dockerfile"
+				;;& # (other Debian variants need to match later blocks)
 			3.4/stretch*)
 				sed -ri -e 's/libssl-dev/libssl1.0-dev/g' "$dir/Dockerfile"
 				;;