Add uuid-dev, libffi-dev and update installer for Python 3.7 build

- uuid-dev is needed for uuid module
- libffi-dev is needef for cytpes
- update installer to be able to handle Python 3.6.8 or Python 3.7 as
  --with-threads is removed in Python 3.7
- Update Makefile to build Python 3.7.2 by default while still
  supporting Python 3.6.8 builds

Author: matthewfeickert

Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /root
 
 SHELL [ "/bin/bash", "-c" ]
 
-ARG PYTHON_VERSION_TAG=3.6.8
+ARG PYTHON_VERSION_TAG=3.7.2
 ARG LINK_PYTHON_TO_PYTHON3=1
 
 # Existing lsb_release causes issues with modern installations of Python3
@@ -27,6 +27,8 @@ RUN apt-get -qq -y update && \
         libgdbm-compat-dev \
         liblzma-dev \
         libreadline-dev \
+        uuid-dev \
+        libffi-dev \
         wget \
         curl \
         git \

Makefile

@@ -1,11 +1,20 @@
-default: all
+default: image
 
-all: image
+all: image py_3.6.8
 
 image:
 	docker build -f Dockerfile \
 	--cache-from matthewfeickert/docker-python3-ubuntu:latest \
-	--build-arg PYTHON_VERSION_TAG=3.6.8 \
+	--build-arg PYTHON_VERSION_TAG=3.7.2 \
 	--build-arg LINK_PYTHON_TO_PYTHON3=1 \
 	-t matthewfeickert/docker-python3-ubuntu:latest \
+	-t matthewfeickert/docker-python3-ubuntu:3.7.2 \
+	--compress .
+
+py_3.6.8:
+	docker build -f Dockerfile \
+	--cache-from matthewfeickert/docker-python3-ubuntu:3.6.8 \
+	--build-arg PYTHON_VERSION_TAG=3.6.8 \
+	--build-arg LINK_PYTHON_TO_PYTHON3=1 \
+	-t matthewfeickert/docker-python3-ubuntu:3.6.8 \
 	--compress .

README.md

@@ -1,6 +1,6 @@
 # Python3 on Ubuntu Docker
 
-Dockerfile for image built off [Ubuntu 18.04](https://wiki.ubuntu.com/BionicBeaver/ReleaseNotes/18.04) containing [Python 3.6](https://www.python.org/downloads/release/python-368/) built from source
+Dockerfile for image built off [Ubuntu 18.04](https://wiki.ubuntu.com/BionicBeaver/ReleaseNotes/18.04) containing [Python 3.7](https://www.python.org/downloads/release/python-372/) ([Python 3.6](https://www.python.org/downloads/release/python-368/)) built from source
 
 [![Docker Automated build](https://img.shields.io/docker/automated/matthewfeickert/docker-python3-ubuntu.svg)](https://hub.docker.com/r/matthewfeickert/docker-python3-ubuntu/)
 [![Docker Build Status](https://img.shields.io/docker/build/matthewfeickert/docker-python3-ubuntu.svg)](https://hub.docker.com/r/matthewfeickert/docker-python3-ubuntu/builds/)
@@ -23,6 +23,8 @@ Dockerfile for image built off [Ubuntu 18.04](https://wiki.ubuntu.com/BionicBeav
 - libgdbm-compat-dev
 - liblzma-dev
 - libreadline-dev
+- uuid-dev
+- libffi-dev
 - wget
 - curl
 - make
@@ -34,4 +36,4 @@ Dockerfile for image built off [Ubuntu 18.04](https://wiki.ubuntu.com/BionicBeav
 
 ### From source
 
-- Python 3.6
+- Python 3.7 (3.6)

install_python.sh

@@ -29,29 +29,37 @@ function build_cpython () {
     # 1: the prefix to be passed to configure
     #    c.f. https://docs.python.org/3/using/unix.html#python-related-paths-and-files
     # 2: the path to the version of gcc to be used
+    # 3: the Python version being built
 
     # https://docs.python.org/3/using/unix.html#building-python
+    # https://github.com/python/cpython/blob/3.7/README.rst
     # https://github.com/python/cpython/blob/3.6/README.rst
     printf "\n### ./configure\n"
-    ./configure --prefix="${1}" \
-        --exec_prefix="${1}" \
-        --with-cxx-main="${2}" \
-        --enable-optimizations \
-        --with-lto \
-        --enable-loadable-sqlite-extensions \
-        --enable-ipv6 \
-        --with-threads \
-        CXX="${2}"
+    if [[ "${3}" > "3.7.0"  ]]; then
+        # --with-threads is removed in Python 3.7 (threading already on)
+        ./configure --prefix="${1}" \
+            --exec_prefix="${1}" \
+            --with-cxx-main="${2}" \
+            --enable-optimizations \
+            --with-lto \
+            --enable-loadable-sqlite-extensions \
+            --enable-ipv6 \
+            CXX="${2}"
+    else
+        ./configure --prefix="${1}" \
+            --exec_prefix="${1}" \
+            --with-cxx-main="${2}" \
+            --enable-optimizations \
+            --with-lto \
+            --enable-loadable-sqlite-extensions \
+            --enable-ipv6 \
+            --with-threads \
+            CXX="${2}"
+    fi
     printf "\n### make -j${NPROC}\n"
     make -j${NPROC}
-    # make install will create symlinks for python3, pip3, and pip
     printf "\n### make install\n"
     make install
-
-    # Link `python` against python3 if no python2 exists
-    if ! command -v python2 >/dev/null 2>&1; then
-        ln -s "${1}"/bin/"python${PYTHON_VERSION_TAG:0:3}" "${1}"/bin/python
-    fi
 }
 
 function update_pip {
@@ -90,7 +98,7 @@ function main() {
     # 1: the Python version tag
     # 2: bool of if should symlink python and pip to python3 versions
 
-    PYTHON_VERSION_TAG=3.6.8 # Switch to 3.7 once Tensorflow is out for it
+    PYTHON_VERSION_TAG=3.7.2
     LINK_PYTHON_TO_PYTHON3=0 # By default don't link so as to reserve python for Python 2
     if [[ $# -gt 0 ]]; then
         PYTHON_VERSION_TAG="${1}"
@@ -103,7 +111,7 @@ function main() {
     NPROC="$(set_num_processors)"
     download_cpython "${PYTHON_VERSION_TAG}"
     cd Python-"${PYTHON_VERSION_TAG}"
-    build_cpython /usr "${CXX_VERSION}"
+    build_cpython /usr "${CXX_VERSION}" "${PYTHON_VERSION_TAG}"
     update_pip
 
     if [[ "${LINK_PYTHON_TO_PYTHON3}" -eq 1 ]]; then