Skip to content

Commit

Permalink
Bump cibuildwheels version (#112)
Browse files Browse the repository at this point in the history
* Update ciwheels.yml

* new version

* use 3.9 in tests (so it works with MacOS arm)

* new wheel action

* comment upload part (that was never triggered)
  • Loading branch information
sgsellan authored Apr 25, 2024
1 parent 3e9257a commit 7427ea8
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 35 deletions.
69 changes: 37 additions & 32 deletions .github/workflows/ciwheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ jobs:
# Why universal2 here? It's not included above in CIBW_BUILD
CIBW_ARCHS_MACOS: "x86_64 arm64 universal2"
CIBW_ENVIRONMENT_MACOS: "CMAKE_OSX_ARCHITECTURES=\"${{ matrix.os.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.os.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.os.cibw-arch == 'macosx_universal2' && 'arm64;x86_64' || '' }}\""
MACOSX_DEPLOYMENT_TARGET: 10.15
CIBW_PRERELEASE_PYTHONS: True
MACOSX_DEPLOYMENT_TARGET: 10.16
# CIBW_PRERELEASE_PYTHONS: True


# env:
Expand All @@ -110,16 +110,20 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: 'recursive'

- name: Build wheels
uses: pypa/[email protected]

- uses: actions/setup-python@v4
name: Install Python
with:
python-version: '3.7'

- name: Install cibuildwheel
run: |
python -m pip install --upgrade pip
python -m pip install cibuildwheel==2.13.1
# - uses: actions/setup-python@v4
# name: Install Python
# with:
# python-version: '3.7'

# - name: Install cibuildwheel
# run: |
# python -m pip install --upgrade pip
# python -m pip install cibuildwheel==2.16

# - name: Add build subdirectories to PATH
# shell: pwsh
Expand Down Expand Up @@ -160,9 +164,9 @@ jobs:
# run: |
# python setup.py sdist -d wheelhouse --formats=gztar

- name: Build wheels
run: |
python -m cibuildwheel --output-dir wheelhouse
# - name: Build wheels
# run: |
# python -m cibuildwheel --output-dir wheelhouse


# - name: Fix Windows wheels
Expand All @@ -176,27 +180,28 @@ jobs:
# Upload binaries to github
- uses: actions/upload-artifact@v3
with:
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
path: |
./wheelhouse/*.whl
./wheelhouse/*.tar.gz
# # Push the resulting binaries to pypi on a tag starting with 'v'
upload_pypi:
needs: [build_wheels]
runs-on: ubuntu-latest
# upload to PyPI on every tag starting with 'v'
# if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
# alternatively, to publish when a GitHub Release is created, use the following rule:
if: github.event_name == 'release' && github.event.action == 'published'
steps:
- uses: actions/download-artifact@v3
with:
name: artifact
path: dist

- uses: pypa/[email protected]
with:
user: __token__
password: ${{ secrets.pypi_password }}
skip_existing: true
# To test: repository_url: https://test.pypi.org/legacy/
# upload_pypi:
# needs: [build_wheels]
# runs-on: ubuntu-latest
# # upload to PyPI on every tag starting with 'v'
# # if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v')
# # alternatively, to publish when a GitHub Release is created, use the following rule:
# if: github.event_name == 'release' && github.event.action == 'published'
# steps:
# - uses: actions/download-artifact@v3
# with:
# name: artifact
# path: dist

# - uses: pypa/[email protected]
# with:
# user: __token__
# password: ${{ secrets.pypi_password }}
# skip_existing: true
# # To test: repository_url: https://test.pypi.org/legacy/
2 changes: 1 addition & 1 deletion .github/workflows/linux_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-python@v2
name: Install Python
with:
python-version: '3.7'
python-version: '3.9'
# sudo apt-get update
# sudo apt-get upgrade
# sudo apt-get purge grub\*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: installpython
name: Install Python
with:
python-version: '3.7'
python-version: '3.9'

- name: Install dependencies
shell: bash -l {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/windows_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/setup-python@v2
name: Install Python
with:
python-version: '3.7'
python-version: '3.9'

# - uses: conda-incubator/setup-miniconda@v2
# with:
Expand Down

0 comments on commit 7427ea8

Please sign in to comment.