Python 3.7: Install libuuid packages for native _uuid module

JayH5 · JayH5 · commit c5afee6efc85 · 2018-08-03T16:29:42.000+02:00
diff --git a/3.7/alpine3.7/Dockerfile b/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
diff --git a/3.7/alpine3.8/Dockerfile b/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
diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile
@@ -40,6 +40,7 @@ RUN set -ex \
 		libssl-dev \
 		make \
 		tk-dev \
+		uuid-dev \
 		wget \
 		xz-utils \
 		zlib1g-dev \
diff --git a/Dockerfile-alpine.template b/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
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
@@ -34,6 +34,7 @@ RUN set -ex \
 		libssl-dev \
 		make \
 		tk-dev \
+		uuid-dev \
 		wget \
 		xz-utils \
 		zlib1g-dev \
diff --git a/update.sh b/update.sh
@@ -165,6 +165,19 @@ for version in "${versions[@]}"; do
 			mv "$dir/Dockerfile.new" "$dir/Dockerfile"
 		fi
 
+		# 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.
+		case "$version" in
+			3.4* | 3.5* | 3.6*)
+				if [[ "$v" = alpine* ]]; then
+					sed -ri -e '/util-linux-dev/d' "$dir/Dockerfile"
+				else
+					sed -ri -e '/uuid-dev/d' "$dir/Dockerfile"
+				fi
+				;;
+		esac
+
 		case "$version/$v" in
 			# https://bugs.python.org/issue32598 (Python 3.7.0b1+)
 			# TL;DR: Python 3.7+ uses OpenSSL functionality which LibreSSL 2.6.x in Alpine 3.7 doesn't implement
