From 6bfb15b186bf1bff37cc54fe2e3abecd20f39598 Mon Sep 17 00:00:00 2001
From: Valentin Niess <niess@in2p3.fr>
Date: Mon, 14 Nov 2022 18:34:36 +0100
Subject: [PATCH] Add Manylinux 2_24 and 2_28

---
 .github/workflows/appimage.yml              | 16 +++++++++++++++-
 python_appimage/commands/build/manylinux.py | 15 ++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml
index ef520d3..dff338b 100644
--- a/.github/workflows/appimage.yml
+++ b/.github/workflows/appimage.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        image: ['1', '2010', '2014']
+        image: ['1', '2010', '2014', '2_24', '2_28']
         arch: [x86_64, i686]
         tag: [cp27-cp27m, cp27-cp27mu, cp35-cp35m, cp36-cp36m, cp37-cp37m,
               cp38-cp38, cp39-cp39, cp310-cp310, cp311-cp311]
@@ -37,6 +37,20 @@ jobs:
             tag: cp27-cp27mu
           - image: '2014'
             tag: cp35-cp35m
+          - image: '2_24'
+            tag: cp27-cp27m
+          - image: '2_24'
+            tag: cp27-cp27mu
+          - image: '2_24'
+            tag: cp35-cp35m
+          - image: '2_28'
+            tag: cp27-cp27m
+          - image: '2_28'
+            tag: cp27-cp27mu
+          - image: '2_28'
+            tag: cp35-cp35m
+          - image: '2_28'
+            arch: i686
 
     steps:
     - uses: actions/checkout@v2
diff --git a/python_appimage/commands/build/manylinux.py b/python_appimage/commands/build/manylinux.py
index cd2d48d..85745f8 100644
--- a/python_appimage/commands/build/manylinux.py
+++ b/python_appimage/commands/build/manylinux.py
@@ -19,6 +19,15 @@ def _unpack_args(args):
     return args.tag, args.abi, args.contained
 
 
+def _manylinux_tag(tag):
+    '''Format Manylinux tag
+    '''
+    if tag.startswith('2_'):
+        return 'manylinux_' + tag
+    else:
+        return 'manylinux' + tag
+
+
 def _get_appimage_name(abi, tag):
     '''Format the Python AppImage name using the ABI and OS tags
     '''
@@ -27,8 +36,8 @@ def _get_appimage_name(abi, tag):
     fullversion = desktop[13:-8]
 
     # Finish building the AppImage on the host. See below.
-    return 'python{:}-{:}-manylinux{:}.AppImage'.format(
-        fullversion, abi, tag)
+    return 'python{:}-{:}-{:}.AppImage'.format(
+        fullversion, abi, _manylinux_tag(tag))
 
 
 def execute(tag, abi, contained=False):
@@ -37,7 +46,7 @@ def execute(tag, abi, contained=False):
 
     if not contained:
         # Forward the build to a Docker image
-        image = 'quay.io/pypa/manylinux' + tag
+        image = 'quay.io/pypa/' + _manylinux_tag(tag)
         python = '/opt/python/' + abi + '/bin/python'
 
         pwd = os.getcwd()