Merge branch 'dev' into 3.8

Author: freakboy3742

Dockerfile

@@ -5,9 +5,18 @@ FROM ubuntu:18.04
 
 # Install the build requirements for Python.
 RUN apt-get update -y && \
-    apt-get install -y gcc make curl \
-        libssl-dev libsqlite3-dev liblzma-dev libbz2-dev libgdbm-dev \
-        libffi-dev zlib1g-dev
+    apt-get install -y \
+        gcc make curl \
+        libbz2-dev \
+        libffi-dev \
+        libgdbm-compat-dev \
+        libgdbm-dev \
+        liblzma-dev \
+        libncurses5-dev \
+        libsqlite3-dev \
+        libssl-dev \
+        uuid-dev \
+        zlib1g-dev
 
 # Install the Makefile and exclude list, and build Python.
 # This Makefile will assume there are two external mountpoints:

Makefile

@@ -4,14 +4,25 @@ PROJECT_DIR=$(shell pwd)
 BUILD_NUMBER=custom
 
 # Version of packages that will be compiled by this meta-package
-PYTHON_VERSION=3.8.6
+# PYTHON_VERSION is the full version number (e.g., 3.10.0b3)
+# PYTHON_MICRO_VERSION is the full version number, without any alpha/beta/rc suffix. (e.g., 3.10.0)
+# PYTHON_VER is the major/minor version (e.g., 3.10)
+PYTHON_VERSION=3.8.13
+PYTHON_MICRO_VERSION=$(shell echo $(PYTHON_VERSION) | grep -Po "\d+\.\d+\.\d+")
 PYTHON_VER=$(basename $(PYTHON_VERSION))
+
 ARCH=$(shell uname -m)
 
 all:
 	@echo "***** Building $(PYTHON_VERSION) $(ARCH) build $(BUILD_NUMBER) *****"
+	rm -rf build
 	docker build -t beeware/python-linux-$(ARCH)-support .
-	docker run -e BUILD_NUMBER=$(BUILD_NUMBER) -v $(PROJECT_DIR)/downloads:/local/downloads -v $(PROJECT_DIR)/dist:/local/dist beeware/python-linux-$(ARCH)-support
+	docker run -e \
+		BUILD_NUMBER=$(BUILD_NUMBER) \
+		-v $(PROJECT_DIR)/downloads:/local/downloads \
+		-v $(PROJECT_DIR)/dist:/local/dist \
+		-v $(PROJECT_DIR)/build:/local/build \
+		beeware/python-linux-$(ARCH)-support
 
 # Clean all builds
 clean:
@@ -33,7 +44,10 @@ downloads: downloads/Python-$(PYTHON_VERSION).tgz dependencies
 # Download original Python source code archive.
 downloads/Python-$(PYTHON_VERSION).tgz:
 	mkdir -p downloads
-	if [ ! -e downloads/Python-$(PYTHON_VERSION).tgz ]; then curl -L https://www.python.org/ftp/python/$(PYTHON_VERSION)/Python-$(PYTHON_VERSION).tgz > downloads/Python-$(PYTHON_VERSION).tgz; fi
+	if [ ! -e downloads/Python-$(PYTHON_VERSION).tgz ]; then \
+		curl --fail -L https://www.python.org/ftp/python/$(PYTHON_MICRO_VERSION)/Python-$(PYTHON_VERSION).tgz \
+			-o downloads/Python-$(PYTHON_VERSION).tgz; \
+	fi
 
 build:
 	mkdir build
@@ -49,10 +63,21 @@ build/Python-$(PYTHON_VERSION)/Makefile: build downloads
 	# Configure target Python
 	cd build/Python-$(PYTHON_VERSION) && ./configure \
 		--prefix=$(PROJECT_DIR)/build/python \
-		--without-doc-strings --enable-ipv6 --without-ensurepip
-
-build/python/bin/python$(PYTHON_VER)m: build/Python-$(PYTHON_VERSION)/Makefile
-	cd build/Python-$(PYTHON_VERSION) && make install
+		--enable-ipv6 \
+		--enable-shared \
+		--without-doc-strings \
+		--without-ensurepip \
+		2>&1 | tee -a ../python-$(PYTHON_VERSION).config.log
+
+build/Python-$(PYTHON_VERSION)/python.exe: build/Python-$(PYTHON_VERSION)/Makefile
+	cd build/Python-$(PYTHON_VERSION) && \
+		make \
+			2>&1 | tee -a ../python-$(PYTHON_VERSION).build.log
+
+build/python/bin/python$(PYTHON_VER): build/Python-$(PYTHON_VERSION)/python.exe
+	cd build/Python-$(PYTHON_VERSION) && \
+		make install \
+			2>&1 | tee -a ../python-$(PYTHON_VERSION).install.log
 
 build/python/VERSIONS: dependencies
 	echo "Python version: $(PYTHON_VERSION) " > build/python/VERSIONS
@@ -62,7 +87,7 @@ build/python/VERSIONS: dependencies
 	echo "OpenSSL: $$(awk '$$2=="openssl" { print $$3 }' downloads/system.versions)" >> build/python/VERSIONS
 	echo "XZ: $$(awk '$$2=="liblzma5:amd64" { print $$3 }' downloads/system.versions)" >> build/python/VERSIONS
 
-dist/Python-$(PYTHON_VER)-linux-$(ARCH)-support.$(BUILD_NUMBER).tar.gz: dist build/python/bin/python$(PYTHON_VER)m build/python/VERSIONS
+dist/Python-$(PYTHON_VER)-linux-$(ARCH)-support.$(BUILD_NUMBER).tar.gz: dist build/python/bin/python$(PYTHON_VER) build/python/VERSIONS
 	tar zcvf $@ -X exclude.list -C build/python `ls -A build/python`
 
 Python: dist/Python-$(PYTHON_VER)-linux-$(ARCH)-support.$(BUILD_NUMBER).tar.gz

README.rst

@@ -1,7 +1,7 @@
 Python Linux Support
 ====================
 
-**This repository branch builds a packaged version of Python 3.8.3**.
+**This repository branch builds a packaged version of Python 3.8.13**.
 Other Python versions are available by cloning other branches of the main
 repository.
 
@@ -18,7 +18,7 @@ project.
 Quickstart
 ----------
 
-A version of this package, compiled on Ubuntu 16.04, is available for `x86_64`_.
+A version of this package, compiled on Ubuntu 18.04, is available for `x86_64`_.
 
 If you want to build your own version, you will need to have Docker installed.
 After installing docker, run::
@@ -35,12 +35,10 @@ This will:
    applications:
 
    * ``2to3``, ``pip``, ``pydoc``, and ``python-configure`` binaries
-   * include files
    * man pages
    * Testing code
    * ``idle``
    * ``tkinter``
-   * ``curses``
    * ``turtle``
 
 6. Build a tarball of the installed output.

exclude.list

@@ -8,8 +8,6 @@ bin/idle3*
 bin/pydoc3*
 bin/python3*-config
 bin/pyvenv*
-# Remove include/ directory, only useful for compiling C extension modules.
-include
 # Remove standard library test suites.
 lib/python*/ctypes/test
 lib/python*/distutils/tests
@@ -21,8 +19,6 @@ lib/python*/lib-dynload/_test*.so
 lib/python*/lib-dynload/_ctypes_test*.so
 lib/python*/lib-dynload/xxlimited*.so
 lib/python*/lib-dynload/_xxtestfuzz.so
-# Remove command-line curses toolkit.
-lib/python*/curses/*
 # Remove config-* directory, which is used for compiling C extension modules.
 lib/python*/config-*
 # Remove ensurepip. If user code needs pip, it can add it to