Merge pull request #445 from sergioisidoro/socket-af-bluetooth

tianon · web-flow · commit bd779fa9aecb · 2019-12-31T10:46:28.000-08:00
Support for socket AF_BLUETOOTH in python standard lib
diff --git a/3.5/alpine3.10/Dockerfile b/3.5/alpine3.10/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.5/alpine3.11/Dockerfile b/3.5/alpine3.11/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.5/buster/Dockerfile b/3.5/buster/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/3.5/buster/slim/Dockerfile b/3.5/buster/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.5/stretch/Dockerfile b/3.5/stretch/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/3.5/stretch/slim/Dockerfile b/3.5/stretch/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.6/alpine3.10/Dockerfile b/3.6/alpine3.10/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.6/alpine3.11/Dockerfile b/3.6/alpine3.11/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.6/buster/Dockerfile b/3.6/buster/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/3.6/buster/slim/Dockerfile b/3.6/buster/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.6/stretch/Dockerfile b/3.6/stretch/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 	&& rm -rf /var/lib/apt/lists/*
 
diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.7/alpine3.10/Dockerfile b/3.7/alpine3.10/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.7/alpine3.11/Dockerfile b/3.7/alpine3.11/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.7/buster/Dockerfile b/3.7/buster/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 		uuid-dev \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.7/buster/slim/Dockerfile b/3.7/buster/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.7/stretch/Dockerfile b/3.7/stretch/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 		uuid-dev \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.7/stretch/slim/Dockerfile b/3.7/stretch/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.8/alpine3.10/Dockerfile b/3.8/alpine3.10/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.8/alpine3.11/Dockerfile b/3.8/alpine3.11/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.8/buster/Dockerfile b/3.8/buster/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 		uuid-dev \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.8/buster/slim/Dockerfile b/3.8/buster/slim/Dockerfile
@@ -28,6 +28,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \
diff --git a/3.9-rc/alpine3.10/Dockerfile b/3.9-rc/alpine3.10/Dockerfile
@@ -38,6 +38,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/3.9-rc/buster/Dockerfile b/3.9-rc/buster/Dockerfile
@@ -15,6 +15,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 \
+		libbluetooth-dev \
 		tk-dev \
 		uuid-dev \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -32,6 +32,7 @@ RUN set -ex \
 	&& rm python.tar.xz \
 	\
 	&& apk add --no-cache --virtual .build-deps  \
+		bluez-dev \
 		bzip2-dev \
 		coreutils \
 		dpkg-dev dpkg \
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -9,7 +9,8 @@ ENV LANG C.UTF-8
 
 # extra dependencies (over what buildpack-deps already includes)
 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)
+		libbluetooth-dev \
+		# 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 \
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
@@ -22,6 +22,7 @@ RUN set -ex \
 	&& apt-get update && apt-get install -y --no-install-recommends \
 		dpkg-dev \
 		gcc \
+		libbluetooth-dev \
 		libbz2-dev \
 		libc6-dev \
 		libexpat1-dev \

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ RUN set -ex \`
`38`	`38`	`&& rm python.tar.xz \`
`39`	`39`	`\`
`40`	`40`	`&& apk add --no-cache --virtual .build-deps \`
	`41`	`+ bluez-dev \`
`41`	`42`	`bzip2-dev \`
`42`	`43`	`coreutils \`
`43`	`44`	`dpkg-dev dpkg \`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ RUN set -ex \`
`32`	`32`	`&& rm python.tar.xz \`
`33`	`33`	`\`
`34`	`34`	`&& apk add --no-cache --virtual .build-deps \`
	`35`	`+ bluez-dev \`
`35`	`36`	`bzip2-dev \`
`36`	`37`	`coreutils \`
`37`	`38`	`dpkg-dev dpkg \`