From 51e358984fd72012effba8b577dba704885ae77e Mon Sep 17 00:00:00 2001
From: Brent Huisman <brenthuisman@users.noreply.github.com>
Date: Wed, 23 Jun 2021 13:11:20 +0200
Subject: [PATCH] Remove default arch target from setup.py (#1594)

Don't pass any architecture by default in setup.py to allow for building binary wheels for targets like x86_64.

Build Python package with 'none' arch by default.
Bump version to 0.5.2.
---
 .github/workflows/ciwheel.yml | 3 +--
 VERSION                       | 2 +-
 setup.py                      | 7 +++----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ciwheel.yml b/.github/workflows/ciwheel.yml
index e9df624e74..7eee44fe2e 100644
--- a/.github/workflows/ciwheel.yml
+++ b/.github/workflows/ciwheel.yml
@@ -30,7 +30,7 @@ jobs:
           CIBW_BUILD: "cp3?-manylinux_x86_64"
           CIBW_SKIP: "cp35-*"
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
-          arch: x86_64
+          CIBW_ARCHS_LINUX: x86_64
           # CIBW_TEST_COMMAND: TODO
 
       - name: Build wheels macos
@@ -44,7 +44,6 @@ jobs:
           CIBW_BUILD: "cp3?-macosx_x86_64"
           CIBW_SKIP: "cp35-*"
           CIBW_ARCHS_MACOS: x86_64 universal2
-          arch: x86_64
           # CIBW_TEST_COMMAND: TODO
 
       # this action runs auditwheel automatically with the following args:
diff --git a/VERSION b/VERSION
index 4b9fcbec10..cb0c939a93 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.1
+0.5.2
diff --git a/setup.py b/setup.py
index 8f8f704502..062000ca3f 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ def __init__(self):
             CL_opt.instance = {'mpi': False,
                                'gpu': 'none',
                                'vec': False,
-                               'arch': 'native',
+                               'arch': 'none',
                                'neuroml': True,
                                'bundled': True}
 
@@ -91,7 +91,7 @@ def run(self):
         #   vec  : generate SIMD vectorized kernels for CPU micro-architecture (boolean).
         opt['vec']  = self.vec is not None
         #   arch : target CPU micro-architecture (string).
-        opt['arch'] = "native" if self.arch is None else self.arch
+        opt['arch'] = 'none' if self.arch is None else self.arch
         #   neuroml : compile with neuroml support for morphologies.
         opt['neuroml'] = self.neuroml is not None
         #   bundled : use bundled/git-submoduled 3rd party libraries.
@@ -126,7 +126,7 @@ def run(self):
             #   vec  : generate SIMD vectorized kernels for CPU micro-architecture (boolean).
             opt['vec']  = self.vec is not None
             #   arch : target CPU micro-architecture (string).
-            opt['arch'] = "native" if self.arch is None else self.arch
+            opt['arch'] = 'none' if self.arch is None else self.arch
             #   neuroml : compile with neuroml support for morphologies.
             opt['neuroml'] = self.neuroml is not None
             #   bundled : use bundled/git-submoduled 3rd party libraries.
@@ -237,4 +237,3 @@ def run(self):
         'Bug Reports': 'https://github.com/arbor-sim/arbor/issues',
     },
 )
-