From f9250992eb8bf48b082dee0c1a2610adc6bbda22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Achard?= <remiachard@gmail.com>
Date: Tue, 23 Jan 2024 04:33:27 +0000
Subject: [PATCH] Add manylinux_2_28 Python wheels (#1933)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
---
 .github/workflows/wheel_workflow.yml | 69 ++++++++++++++++++++++------
 pyproject.toml                       |  4 --
 2 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/wheel_workflow.yml b/.github/workflows/wheel_workflow.yml
index 5dff59df1..022c30496 100644
--- a/.github/workflows/wheel_workflow.yml
+++ b/.github/workflows/wheel_workflow.yml
@@ -78,45 +78,84 @@ jobs:
       matrix:
         include:
           # -------------------------------------------------------------------
-          # CPython 64 bits
+          # CPython 64 bits manylinux_2_28
           # -------------------------------------------------------------------
-          - build: CPython 3.7 64 bits
+          - build: CPython 3.7 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
             python: cp37-manylinux*
             arch: x86_64
-          - build: CPython 3.8 64 bits
+          - build: CPython 3.8 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
             python: cp38-manylinux*
             arch: x86_64
-          - build: CPython 3.9 64 bits
+          - build: CPython 3.9 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
             python: cp39-manylinux*
             arch: x86_64
-          - build: CPython 3.10 64 bits
+          - build: CPython 3.10 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
             python: cp310-manylinux*
             arch: x86_64
-          - build: CPython 3.11 64 bits
+          - build: CPython 3.11 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
             python: cp311-manylinux*
             arch: x86_64
-          - build: CPython 3.12 64 bits
+          - build: CPython 3.12 64 bits manylinux_2_28
+            manylinux: manylinux_2_28
             python: cp312-manylinux*
             arch: x86_64
           # -------------------------------------------------------------------
-          # CPython ARM 64 bits
+          # CPython 64 bits manylinux2014
           # -------------------------------------------------------------------
-          - build: CPython 3.7 ARM 64 bits
+          - build: CPython 3.7 64 bits  manylinux2014
+            manylinux: manylinux2014
+            python: cp37-manylinux*
+            arch: x86_64
+          - build: CPython 3.8 64 bits  manylinux2014
+            manylinux: manylinux2014
+            python: cp38-manylinux*
+            arch: x86_64
+          - build: CPython 3.9 64 bits  manylinux2014
+            manylinux: manylinux2014
+            python: cp39-manylinux*
+            arch: x86_64
+          - build: CPython 3.10 64 bits  manylinux2014
+            manylinux: manylinux2014
+            python: cp310-manylinux*
+            arch: x86_64
+          - build: CPython 3.11 64 bits  manylinux2014
+            manylinux: manylinux2014
+            python: cp311-manylinux*
+            arch: x86_64
+          - build: CPython 3.12 64 bits  manylinux2014
+            manylinux: manylinux2014
+            python: cp312-manylinux*
+            arch: x86_64
+          # -------------------------------------------------------------------
+          # CPython ARM 64 bits manylinux2014
+          # -------------------------------------------------------------------
+          - build: CPython 3.7 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
             python: cp37-manylinux*
             arch: aarch64
-          - build: CPython 3.8 ARM 64 bits
+          - build: CPython 3.8 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
             python: cp38-manylinux*
             arch: aarch64
-          - build: CPython 3.9 ARM 64 bits
+          - build: CPython 3.9 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
             python: cp39-manylinux*
             arch: aarch64
-          - build: CPython 3.10 ARM 64 bits
+          - build: CPython 3.10 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
             python: cp310-manylinux*
             arch: aarch64
-          - build: CPython 3.11 ARM 64 bits
+          - build: CPython 3.11 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
             python: cp311-manylinux*
             arch: aarch64
-          - build: CPython 3.12 ARM 64 bits
+          - build: CPython 3.12 ARM 64 bits manylinux2014
+            manylinux: manylinux2014
             python: cp312-manylinux*
             arch: aarch64
 
@@ -138,6 +177,8 @@ jobs:
         env:
           CIBW_BUILD: ${{ matrix.python }}
           CIBW_ARCHS: ${{ matrix.arch }}
+          CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux }}
+          CIBW_MANYLINUX_AARCH64_IMAGE: ${{ matrix.manylinux }}
 
       - uses: actions/upload-artifact@v3
         with:
diff --git a/pyproject.toml b/pyproject.toml
index 337ae4a4f..df4058a1c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,10 +26,6 @@ test-command = [
     "ociocheck"
 ]
 
-manylinux-x86_64-image = "manylinux2014"
-manylinux-i686-image = "manylinux2014"
-manylinux-aarch64-image = "manylinux2014"
-
 [tool.cibuildwheel.linux]
 before-build = "share/ci/scripts/linux/yum/install_docs_env.sh"