Merge pull request #157 from isuruf/universal2-name

Fix universal2 wheel name and remove redundant builds

Author: tylerjereddy

azure-pipelines.yml

@@ -55,21 +55,13 @@ jobs:
           MB_PYTHON_VERSION: "3.8"
           MB_PYTHON_OSX_VER: "10.9"
           PLAT: universal2
-        osx-Py38_arm64:
-          MB_PYTHON_VERSION: "3.8"
-          MB_PYTHON_OSX_VER: "10.9"
-          PLAT: arm64
         osx-Py39:
           MB_PYTHON_VERSION: "3.9"
           MB_PYTHON_OSX_VER: "10.9"
         osx-Py39-universal2:
           MB_PYTHON_VERSION: "3.9"
           MB_PYTHON_OSX_VER: "10.9"
           PLAT: universal2
-        osx-Py39_arm64:
-          MB_PYTHON_VERSION: "3.9"
-          MB_PYTHON_OSX_VER: "10.9"
-          PLAT: arm64
         osx-Py310:
           MB_PYTHON_VERSION: "3.10"
           MB_PYTHON_OSX_VER: "10.9"
@@ -78,7 +70,3 @@ jobs:
           MB_PYTHON_VERSION: "3.10"
           MB_PYTHON_OSX_VER: "10.9"
           PLAT: universal2
-        osx-Py310_arm64:
-          MB_PYTHON_VERSION: "3.10"
-          MB_PYTHON_OSX_VER: "11.0"
-          PLAT: arm64

azure-posix.yml

@@ -86,11 +86,11 @@ jobs:
           set -xe
           for file in `find ./wheelhouse -type f -name '*11_0_arm64*.whl'`; do mv -v "$file" "${file/11_0_arm64/12_0_arm64}"; done
         displayName: "Rename MacOS arm64 wheels for version 12.0 minimum"
-        condition: eq(variables['PLAT'], 'arm64')
+        condition: or(eq(variables['PLAT'], 'arm64'), eq(variables['PLAT'], 'universal2'))
 
       - bash: |
           set -xe
-          for file in `find ./wheelhouse -type f -name '*10_9_universal2.whl'`; do mv -v "$file" "${file/10_9_universal2/12_0_universal2}"; done
+          for file in `find ./wheelhouse -type f -name '*10_9_universal2.whl'`; do mv -v "$file" "${file/macosx_10_9_universal2/macosx_12_0_universal2.macosx_10_9_x86_64}"; done
         displayName: "Rename MacOS universal2 wheels for version 12.0 minimum"
         condition: eq(variables['PLAT'], 'universal2')