From 252c61757f84bf45afee2f38e6e4fc5e0b7caae8 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 26 Jun 2022 15:33:09 +1000
Subject: [PATCH] Added Python 3.11.0b3

---
 .github/workflows/build.sh         |  2 ++
 .github/workflows/wheels-linux.yml |  6 +++++-
 .github/workflows/wheels-macos.yml |  2 +-
 .travis.yml                        | 12 ++++++++++++
 config.sh                          |  8 ++++++--
 multibuild                         |  2 +-
 6 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh
index 585e37d85..98bbbe472 100755
--- a/.github/workflows/build.sh
+++ b/.github/workflows/build.sh
@@ -19,6 +19,8 @@ if [[ "$MB_PYTHON_VERSION" == pypy3* ]]; then
   if [[ "$PLAT" == "i686" ]]; then
     DOCKER_TEST_IMAGE="multibuild/xenial_$PLAT"
   fi
+elif [[ "$MB_PYTHON_VERSION" == "3.11" ]] && [[ "$PLAT" == "i686" ]]; then
+  DOCKER_TEST_IMAGE="radarhere/bionic-$PLAT"
 fi
 
 echo "::group::Install a virtualenv"
diff --git a/.github/workflows/wheels-linux.yml b/.github/workflows/wheels-linux.yml
index cf2cd3fc3..e7202f405 100644
--- a/.github/workflows/wheels-linux.yml
+++ b/.github/workflows/wheels-linux.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10" ]
+        python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10", "3.11" ]
         platform: [ "i686", "x86_64" ]
         mb-ml-libc: [ "manylinux" ]
         mb-ml-ver: [ 2014, "_2_28" ]
@@ -41,6 +41,10 @@ jobs:
             platform: "x86_64"
             mb-ml-libc: "musllinux"
             mb-ml-ver: "_1_1"
+          - python: "3.11"
+            platform: "x86_64"
+            mb-ml-libc: "musllinux"
+            mb-ml-ver: "_1_1"
     env:
       BUILD_COMMIT: ${{ inputs.build-commit }}
       PLAT: ${{ matrix.platform }}
diff --git a/.github/workflows/wheels-macos.yml b/.github/workflows/wheels-macos.yml
index a7addfed7..3a24f8780 100644
--- a/.github/workflows/wheels-macos.yml
+++ b/.github/workflows/wheels-macos.yml
@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10" ]
+        python: [ "pypy3.7-7.3.9", "pypy3.8-7.3.9", "3.7", "3.8", "3.9", "3.10", "3.11" ]
         platform: [ "x86_64", "arm64" ]
         exclude:
           - python: "3.7"
diff --git a/.travis.yml b/.travis.yml
index b9cf97c23..74bf58eeb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -59,6 +59,18 @@ jobs:
       env:
         - MB_ML_VER="_2_28"
         - MB_PYTHON_VERSION=3.10
+    - name: "3.11 Focal manylinux_2_28 aarch64"
+      os: linux
+      arch: arm64
+      env:
+        - MB_ML_VER=2014
+        - MB_PYTHON_VERSION=3.11
+    - name: "3.11 Focal manylinux_2_28 aarch64"
+      os: linux
+      arch: arm64
+      env:
+        - MB_ML_VER="_2_28"
+        - MB_PYTHON_VERSION=3.11
 
 before_install:
     - source multibuild/common_utils.sh
diff --git a/config.sh b/config.sh
index c259bb9f9..496598a06 100644
--- a/config.sh
+++ b/config.sh
@@ -143,6 +143,8 @@ function pip_wheel_cmd {
     local abs_wheelhouse=$1
     if [ -z "$IS_MACOS" ]; then
         CFLAGS="$CFLAGS --std=c99"  # for Raqm
+    elif [[ "$MB_PYTHON_VERSION" == "3.11" ]]; then
+        unset _PYTHON_HOST_PLATFORM
     fi
     pip wheel $(pip_opts) \
         --global-option build_ext --global-option --enable-raqm \
@@ -173,8 +175,10 @@ function run_tests {
         apt-get install libfribidi0
     fi
     if [[ $(uname -m) == "i686" ]]; then
-        python3 -m pip install numpy==1.21
-    elif [ -z "$IS_ALPINE" ]; then
+        if [[ "$MB_PYTHON_VERSION" != 3.11 ]]; then
+            python3 -m pip install numpy==1.21
+        fi
+    elif [ -z "$IS_ALPINE" ] && !([ -n "$IS_MACOS" ] && [[ "$MB_PYTHON_VERSION" == 3.11 ]]); then
         python3 -m pip install numpy
     fi
 
diff --git a/multibuild b/multibuild
index a573af1e3..10d9a4c96 160000
--- a/multibuild
+++ b/multibuild
@@ -1 +1 @@
-Subproject commit a573af1e3c701b3326a2b185719c0bd116ab44a4
+Subproject commit 10d9a4c9663759e194495e87eb84f96f7cb513e9