Merge pull request #7304 from chrahunt/refactor/remove-unused-noarch

Remove unused noarch flag in pep425tags.get_supported

Author: chrahunt

src/pip/_internal/pep425tags.py

@@ -327,7 +327,6 @@ def get_all_minor_versions_as_strings(version_info):
 
 def get_supported(
     versions=None,  # type: Optional[List[str]]
-    noarch=False,  # type: bool
     platform=None,  # type: Optional[str]
     impl=None,  # type: Optional[str]
     abi=None  # type: Optional[str]
@@ -369,67 +368,66 @@ def get_supported(
 
     abis.append('none')
 
-    if not noarch:
-        arch = platform or get_platform()
-        arch_prefix, arch_sep, arch_suffix = arch.partition('_')
-        if arch.startswith('macosx'):
-            # support macosx-10.6-intel on macosx-10.9-x86_64
-            match = _osx_arch_pat.match(arch)
-            if match:
-                name, major, minor, actual_arch = match.groups()
-                tpl = '{}_{}_%i_%s'.format(name, major)
-                arches = []
-                for m in reversed(range(int(minor) + 1)):
-                    for a in get_darwin_arches(int(major), m, actual_arch):
-                        arches.append(tpl % (m, a))
-            else:
-                # arch pattern didn't match (?!)
-                arches = [arch]
-        elif arch_prefix == 'manylinux2014':
-            arches = [arch]
-            # manylinux1/manylinux2010 wheels run on most manylinux2014 systems
-            # with the exception of wheels depending on ncurses. PEP 599 states
-            # manylinux1/manylinux2010 wheels should be considered
-            # manylinux2014 wheels:
-            # https://www.python.org/dev/peps/pep-0599/#backwards-compatibility-with-manylinux2010-wheels
-            if arch_suffix in {'i686', 'x86_64'}:
-                arches.append('manylinux2010' + arch_sep + arch_suffix)
-                arches.append('manylinux1' + arch_sep + arch_suffix)
-        elif arch_prefix == 'manylinux2010':
-            # manylinux1 wheels run on most manylinux2010 systems with the
-            # exception of wheels depending on ncurses. PEP 571 states
-            # manylinux1 wheels should be considered manylinux2010 wheels:
-            # https://www.python.org/dev/peps/pep-0571/#backwards-compatibility-with-manylinux1-wheels
-            arches = [arch, 'manylinux1' + arch_sep + arch_suffix]
-        elif platform is None:
+    arch = platform or get_platform()
+    arch_prefix, arch_sep, arch_suffix = arch.partition('_')
+    if arch.startswith('macosx'):
+        # support macosx-10.6-intel on macosx-10.9-x86_64
+        match = _osx_arch_pat.match(arch)
+        if match:
+            name, major, minor, actual_arch = match.groups()
+            tpl = '{}_{}_%i_%s'.format(name, major)
             arches = []
-            if is_manylinux2014_compatible():
-                arches.append('manylinux2014' + arch_sep + arch_suffix)
-            if is_manylinux2010_compatible():
-                arches.append('manylinux2010' + arch_sep + arch_suffix)
-            if is_manylinux1_compatible():
-                arches.append('manylinux1' + arch_sep + arch_suffix)
-            arches.append(arch)
+            for m in reversed(range(int(minor) + 1)):
+                for a in get_darwin_arches(int(major), m, actual_arch):
+                    arches.append(tpl % (m, a))
         else:
+            # arch pattern didn't match (?!)
             arches = [arch]
+    elif arch_prefix == 'manylinux2014':
+        arches = [arch]
+        # manylinux1/manylinux2010 wheels run on most manylinux2014 systems
+        # with the exception of wheels depending on ncurses. PEP 599 states
+        # manylinux1/manylinux2010 wheels should be considered
+        # manylinux2014 wheels:
+        # https://www.python.org/dev/peps/pep-0599/#backwards-compatibility-with-manylinux2010-wheels
+        if arch_suffix in {'i686', 'x86_64'}:
+            arches.append('manylinux2010' + arch_sep + arch_suffix)
+            arches.append('manylinux1' + arch_sep + arch_suffix)
+    elif arch_prefix == 'manylinux2010':
+        # manylinux1 wheels run on most manylinux2010 systems with the
+        # exception of wheels depending on ncurses. PEP 571 states
+        # manylinux1 wheels should be considered manylinux2010 wheels:
+        # https://www.python.org/dev/peps/pep-0571/#backwards-compatibility-with-manylinux1-wheels
+        arches = [arch, 'manylinux1' + arch_sep + arch_suffix]
+    elif platform is None:
+        arches = []
+        if is_manylinux2014_compatible():
+            arches.append('manylinux2014' + arch_sep + arch_suffix)
+        if is_manylinux2010_compatible():
+            arches.append('manylinux2010' + arch_sep + arch_suffix)
+        if is_manylinux1_compatible():
+            arches.append('manylinux1' + arch_sep + arch_suffix)
+        arches.append(arch)
+    else:
+        arches = [arch]
 
-        # Current version, current API (built specifically for our Python):
-        for abi in abis:
-            for arch in arches:
-                supported.append(('%s%s' % (impl, versions[0]), abi, arch))
-
-        # abi3 modules compatible with older version of Python
-        for version in versions[1:]:
-            # abi3 was introduced in Python 3.2
-            if version in {'31', '30'}:
-                break
-            for abi in abi3s:   # empty set if not Python 3
-                for arch in arches:
-                    supported.append(("%s%s" % (impl, version), abi, arch))
-
-        # Has binaries, does not use the Python API:
+    # Current version, current API (built specifically for our Python):
+    for abi in abis:
         for arch in arches:
-            supported.append(('py%s' % (versions[0][0]), 'none', arch))
+            supported.append(('%s%s' % (impl, versions[0]), abi, arch))
+
+    # abi3 modules compatible with older version of Python
+    for version in versions[1:]:
+        # abi3 was introduced in Python 3.2
+        if version in {'31', '30'}:
+            break
+        for abi in abi3s:   # empty set if not Python 3
+            for arch in arches:
+                supported.append(("%s%s" % (impl, version), abi, arch))
+
+    # Has binaries, does not use the Python API:
+    for arch in arches:
+        supported.append(('py%s' % (versions[0][0]), 'none', arch))
 
     # No abi / arch, but requires our implementation:
     supported.append(('%s%s' % (impl, versions[0]), 'none', 'any'))