From 22f4528bdb898cc520baeec3c353259cd54f1981 Mon Sep 17 00:00:00 2001
From: wilko77 <wilko77@users.noreply.github.com>
Date: Wed, 24 Jun 2020 12:43:17 +1000
Subject: [PATCH] building wheels for mac (#302)

* checking new cibuildwheel

* cleaning
---
 .azurePipeline/cibuildwheel_steps.yml |  6 ++----
 azurePipeline.yml                     | 18 +++++++++---------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/.azurePipeline/cibuildwheel_steps.yml b/.azurePipeline/cibuildwheel_steps.yml
index 7b4dddc1..0a75f386 100644
--- a/.azurePipeline/cibuildwheel_steps.yml
+++ b/.azurePipeline/cibuildwheel_steps.yml
@@ -1,10 +1,8 @@
 
 steps:
 - bash: |
-    python -m pip install -U wheel==0.34.1
-    # See https://github.com/joerick/cibuildwheel/pull/220
-    # for discussion on supporting MacOS x64 builds
-    python -m pip install git+https://github.com/joerick/cibuildwheel@b779a88fde08aa85dd2e86dea536b70dfcad913c
+    python3 -m pip install --upgrade pip
+    pip3 install cibuildwheel==1.4.2
     cibuildwheel --print-build-identifiers
     cibuildwheel --output-dir wheelhouse .
   displayName: Build Wheel
diff --git a/azurePipeline.yml b/azurePipeline.yml
index ee87122b..a58056fb 100644
--- a/azurePipeline.yml
+++ b/azurePipeline.yml
@@ -15,9 +15,7 @@ stages:
     CIBW_BEFORE_BUILD_LINUX: 'yum install -y libffi-devel atlas-devel'
     # Only build for Python36+, and x64 arch
     CIBW_BUILD: 'cp38-* cp37-* cp36-*'
-    # Add MacOS Python 3.6 and 3.7 on x64 once https://github.com/joerick/cibuildwheel/pull/220
-    # is merged/released.
-    CIBW_SKIP: '*-win32 *-manylinux_i686 *macosx_intel'
+    CIBW_SKIP: '*-win32 *-manylinux_i686'
   jobs:
   - job: linux_38
     displayName: Linux + Python3.8
@@ -49,7 +47,10 @@ stages:
     variables:
       MACOSX_DEPLOYMENT_TARGET: '10.14'
     steps:
-    - template: .azurePipeline/cibuildwheel_steps.yml
+      - {task: UsePythonVersion@0, inputs: {versionSpec: '3.6', architecture: x64}}
+      - {task: UsePythonVersion@0, inputs: {versionSpec: '3.7', architecture: x64}}
+      - {task: UsePythonVersion@0, inputs: {versionSpec: '3.8', architecture: x64}}
+      - template: .azurePipeline/cibuildwheel_steps.yml
   - job: windows
     displayName: Windows
     pool: {vmImage: 'vs2017-win2016'}
@@ -90,11 +91,10 @@ stages:
       vmImage: 'macOS-10.14'
     strategy:
       matrix:
-# Uncomment once wheels build on Python3.7 x64
-#        Python3.7:
-#          pythonVersion: '3.7'
-#          artifactName: 'wheels.macos'
-#          artifactPattern: '**/*cp37*.whl'
+        Python3.7:
+          pythonVersion: '3.7'
+          artifactName: 'wheels.macos'
+          artifactPattern: '**/*cp37*.whl'
         Python3.8:
           pythonVersion: '3.8'
           artifactName: 'wheels.macos'