From 2417df49684b9721f8f6ee8b84763499ff26c4b3 Mon Sep 17 00:00:00 2001
From: Bryan Hunt <bryan.hunt@microchip.com>
Date: Fri, 13 Mar 2020 18:39:44 -0600
Subject: [PATCH] Enabled cibuildwheel for appveyor so python 3.8 wheels get
 built

---
 appveyor.yml    | 45 +++++++++++++++++++++------------------------
 python/setup.py |  3 +--
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index f35b22e6d..61dae0c85 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -5,47 +5,44 @@ environment:
     secure: nGYP/oqo/DSfCQduEhhKGg==
 
   matrix:
-    - PYTHON: "C:\\Python27"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python27-x64"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python35"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python35-x64"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python36"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python36-x64"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python37"
-      TAG_SCENARIO: true
-    - PYTHON: "C:\\Python37-x64"
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+      APPVEYOR_JOB_NAME: "python37-x64-vs2017"
       TAG_SCENARIO: true
 
+stack: python 3.7
+
+init:
+    - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH%
+
 install:
-    - cmd: "%PYTHON%\\python.exe -m pip install --upgrade pip"
-    - cmd: "%PYTHON%\\python.exe -m pip install --upgrade setuptools"
-    - cmd: "%PYTHON%\\python.exe -m pip install --upgrade wheel"
-    - cmd: "%PYTHON%\\python.exe -m pip install --upgrade pytest"
-    - cmd: "%PYTHON%\\python.exe -m pip install --upgrade enum34"
-    - cmd: "%PYTHON%\\python.exe -m pip install --upgrade twine"
+    - python -m pip install --upgrade twine
+    - python -m pip install --upgrade cibuildwheel
+
 
 before_build:
     - cd python
+    - mkdir lib
+    - mkdir app
+    - mkdir third_party
+    - xcopy /S ..\lib lib
+    - xcopy /S ..\third_party third_party
+    - xcopy /S ..\app\tng app
+    - copy ..\test\atca_utils_sizes.c .
     - cmd: "git describe --exclude v* --tags --abbrev=0 >VERSION"
 
 build_script:
-    - cmd: "%PYTHON%\\python.exe setup.py bdist_wheel"
+    - python -m cibuildwheel --output-dir wheelhouse
 
 artifacts:
-    - path: python\dist\*.whl
+    - path: python\wheelhouse\*.whl
+      name: Wheels
 
 #on_success:
 #  You can use this step to upload your artifacts to a public website.
 #  See Appveyor's documentation for more details. Or you can simply
 #  access your wheels from the Appveyor "artifacts" tab for your build.
 deploy_script:
-    - ps: if ($env:APPVEYOR_REPO_TAG -eq $TRUE -and $env:APPVEYOR_REPO_TAG_NAME -notlike "v*") { & ${env:PYTHON}\python.exe -m twine upload "dist\*.whl" --skip-existing }
+    - ps: if ($env:APPVEYOR_REPO_TAG -eq $TRUE -and $env:APPVEYOR_REPO_TAG_NAME -notlike "v*") { & python -m twine upload "wheelhouse\*.whl" --skip-existing }
 
 for:
 -
diff --git a/python/setup.py b/python/setup.py
index cff350a96..0fc672e25 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -219,9 +219,8 @@ def has_ext_modules(self):
         include_package_data=True,
         distclass=BinaryDistribution,
         cmdclass=_COMMANDS,
-        setup_requires=['setuptools>=38.6.0', 'wheel'],
         install_requires=['enum34;python_version<"3.4"'],
         ext_modules=_EXTENSIONS,
-        python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
+        python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, <4',
         zip_safe=False
     )