Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit 9f99bd3

Browse files
committed
disable arm64 for mac until pypa/cibuildwheel#1416
1 parent 717b872 commit 9f99bd3

File tree

3 files changed

+6
-38
lines changed

3 files changed

+6
-38
lines changed

.github/workflows/deploy.yml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
with:
2020
path: dist/*.tar.gz
2121

22-
make_amd64_wheels:
22+
make_wheels:
2323
name: Make wheels on ${{ matrix.os }}
2424
runs-on: ${{ matrix.os }}
2525
strategy:
@@ -31,31 +31,13 @@ jobs:
3131

3232
- name: Build wheels
3333
run: pipx run cibuildwheel==2.12.0
34-
env:
35-
CIBW_ARCHS_MACOS: x86_64
36-
37-
- uses: actions/upload-artifact@v3
38-
with:
39-
path: wheelhouse/*.whl
40-
41-
make_arm64_wheels:
42-
name: Make wheels on macos-12 for arm64
43-
runs-on: macos-12
44-
45-
steps:
46-
- uses: actions/checkout@v3
47-
48-
- name: Build wheels
49-
run: pipx run cibuildwheel==2.12.0
50-
env:
51-
CIBW_ARCHS_MACOS: arm64
5234

5335
- uses: actions/upload-artifact@v3
5436
with:
5537
path: wheelhouse/*.whl
5638

5739
upload_all:
58-
needs: [make_amd64_wheels, make_arm64_wheels, make_sdist]
40+
needs: [make_wheels, make_sdist]
5941
runs-on: ubuntu-22.04
6042
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
6143
steps:

build_ext.py

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
import re
33
import shutil
44
import sys
5-
import platform
65
import tarfile
76
import urllib.request
87
from dataclasses import dataclass
@@ -59,16 +58,6 @@ def rm(folder: Path, pattern: str):
5958
filename.unlink()
6059

6160

62-
def darwin_setup():
63-
machine = platform.machine()
64-
# Set by setuptools/cibuildwheels
65-
archflags = os.environ.get("ARCHFLAGS")
66-
if archflags is not None:
67-
machine = ";".join(set(archflags.split()) & {"x86_64", "arm64"})
68-
69-
os.environ.setdefault("CMAKE_OSX_ARCHITECTURES", machine)
70-
71-
7261
def build_ext(ext: Ext):
7362
from cmake import CMAKE_BIN_DIR
7463

@@ -89,9 +78,6 @@ def build_ext(ext: Ext):
8978
with tarfile.open(TMP / tar_filename) as tf:
9079
tf.extractall(TMP)
9180

92-
if sys.platform == "darwin":
93-
darwin_setup()
94-
9581
cmake = [str(v) for v in Path(CMAKE_BIN_DIR).glob("cmake*")][0]
9682
check_call([cmake, "-S", str(prj_dir), "-B", str(bld_dir)] + ext.cmake_opts)
9783
n = os.cpu_count()

pyproject.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "deciphon-core"
3-
version = "0.2.2"
3+
version = "0.2.3"
44
description = "Python package for biding the C implementation"
55
authors = ["Danilo Horta <[email protected]>"]
66
license = "MIT"
@@ -17,9 +17,9 @@ python = "^3.9"
1717
cffi = "*"
1818

1919
[tool.poetry.group.dev.dependencies]
20-
pytest = "^7.2.0"
21-
pyright = "^1.1.288"
22-
blx = "^0.1.8"
20+
pytest = ">=7.2.0"
21+
pyright = ">=1.1.288"
22+
blx = ">=0.1.8"
2323

2424
[tool.poetry.build]
2525
script = "build_ext.py"

0 commit comments

Comments
 (0)