From 186e09d5439c317c1ff6d88afd547fde56f8818a Mon Sep 17 00:00:00 2001
From: Yannick Jadoul <yannick.jadoul@belgacom.net>
Date: Fri, 13 Dec 2019 20:33:20 +0100
Subject: [PATCH] Implementing @mayeut's suggestion for alternative way of
 generating CPython/PyPy manylinux and Windows platform tags in
 test/shared/utils.py

---
 test/shared/utils.py | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/test/shared/utils.py b/test/shared/utils.py
index 3095eaa4..f78ac0e3 100644
--- a/test/shared/utils.py
+++ b/test/shared/utils.py
@@ -83,27 +83,23 @@ def expected_wheels(package_name, package_version, manylinux_versions=['manylinu
                        'pp272-pypy_41', 'pp372-pypy3_72']
     if platform == 'linux':
         python_abi_tags.append('cp27-cp27mu')  # python 2.7 has 2 different ABI on manylinux
-        cp_architectures = ['x86_64', 'i686']
-        pp_architectures = ['x86_64']
-
+        architectures = {'cp': ['x86_64', 'i686'], 'pp': ['x86_64']}
+        platform_tags = {}
+        for python_implemention in architectures:
+            platform_tags[python_implemention] = [
+                '{manylinux_version}_{architecture}'.format(
+                    manylinux_version=manylinux_version, architecture=architecture)
+                for architecture in architectures[python_implemention]
+                for manylinux_version in manylinux_versions
+            ]
         def get_platform_tags(python_abi_tag):
-            if python_abi_tag.startswith('pp'):
-                architectures = pp_architectures
-            else:
-                architectures = cp_architectures
-            return ['{manylinux_version}_{architecture}'.format(
-                        manylinux_version=manylinux_version, architecture=architecture
-                    )
-                    for manylinux_version in manylinux_versions
-                    for architecture in architectures]
+            return platform_tags[python_abi_tag[:2]]
     elif platform == 'windows':
         # The PyPy3 ABI tag for Windows will be consistent in the 7.3.0 release
         python_abi_tags[python_abi_tags.index('pp372-pypy3_72')] = 'pp372-pp372'
+        platform_tags = {'cp': ['win32', 'win_amd64'], 'pp': ['win32']}
         def get_platform_tags(python_abi_tag):
-            if python_abi_tag.startswith('pp'):
-                return ['win32']
-            else:
-                return ['win32', 'win_amd64']
+            return platform_tags[python_abi_tag[:2]]
 
     elif platform == 'macos':
         def get_platform_tags(python_abi_tag):