diff --git a/.github/workflows/build_wheel.yml b/.github/workflows/build_wheel.yml index 8c4d5fb..f4b422e 100644 --- a/.github/workflows/build_wheel.yml +++ b/.github/workflows/build_wheel.yml @@ -6,7 +6,7 @@ on: tags: - '*' env: - CIBW_SKIP: cp27-* cp33-* cp34-* cp35-* pp* *-musllinux* + CIBW_SKIP: cp27-* cp33-* cp34-* cp35-* cp36-* cp37-* pp* *-musllinux* jobs: build_wheels: @@ -14,14 +14,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-20.04, windows-2019, macos-latest] + os: [ubuntu-latest, windows-2019, macos-latest] arch: [auto] include: - - os: ubuntu-20.04 + - os: ubuntu-latest arch: aarch64 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set up QEMU if: ${{ matrix.arch == 'aarch64' }} @@ -32,8 +32,9 @@ jobs: # to supply options, put them in 'env', like: env: CIBW_ARCHS_LINUX: ${{matrix.arch}} - CIBW_BEFORE_BUILD: pip install oldest-supported-numpy + CIBW_BEFORE_BUILD: pip install oldest-supported-numpy setuptools wheel cython + CIBW_ARCHS_MACOS: "x86_64 arm64" - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl \ No newline at end of file diff --git a/setup.py b/setup.py index 15ec417..882612f 100644 --- a/setup.py +++ b/setup.py @@ -44,7 +44,7 @@ def read(fname): 'kimimaro.skeletontricks', sources=[ './ext/skeletontricks/skeletontricks.pyx' ], language='c++', - include_dirs=[ NumpyImport() ], + include_dirs=[ str(NumpyImport()) ], extra_compile_args=[ '-std=c++11', '-O3', '-ffast-math' ] diff --git a/tox.ini b/tox.ini index cceb16d..82d2993 100644 --- a/tox.ini +++ b/tox.ini @@ -1,9 +1,12 @@ [tox] -envlist = py38,py39,py310,py311 +envlist = py38,py39,py310,py311,py312 [testenv] platform = darwin deps = + setuptools + wheel + cython -rrequirements.txt oldest-supported-numpy