Skip to content

Bump joerick/cibuildwheel to v1.12.0 in GHA #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
martindurant merged 1 commit into from
Feb 14, 2022
Merged

Bump joerick/cibuildwheel to v1.12.0 in GHA #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/pypy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: PyPy

on: [push]
on:
push:
branches:
- master
pull_request:

jobs:
build:
Expand All @@ -21,7 +25,7 @@ jobs:
architecture: x64

- name: Install test dependencies
run: pip install cffi flake8 pytest
run: pip install cffi flake8 pytest wheel

- name: Install libsnappy-dev
run: sudo apt-get install libsnappy-dev
Expand Down
20 changes: 9 additions & 11 deletions .github/workflows/wheel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: PyPi wheel and sdist

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

jobs:
sdist:
Expand All @@ -14,7 +18,7 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: "3.9"
architecture: x64

- name: Install test dependencies
Expand Down Expand Up @@ -50,7 +54,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macos-10.15, windows-2019]
os: [ubuntu-20.04, macos-11, windows-2019]
architecture: ['x64']
linux_archs: ["auto s390x"]
include:
Expand Down Expand Up @@ -85,15 +89,9 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: "3.8"
python-version: "3.9"
architecture: ${{ matrix.architecture }}

# - name: Install Visual C++ for Python 2.7
# if: runner.os == 'Windows'
# run: |
# choco install vcpython27 -f -y


- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v1
Expand All @@ -110,7 +108,7 @@ jobs:
python -m pip install delvewheel==0.0.9

- name: Build wheels
uses: joerick/cibuildwheel@v1.9.0
uses: joerick/cibuildwheel@v1.12.0

- uses: actions/upload-artifact@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@
if 'PyPy' in sys.version:
from setuptools import setup
ext_modules = []
install_requires = ['cffi>=1.0.0']
setup_requires = ['cffi>=1.0.0']
install_requires = ['cffi>=1.15.0']
setup_requires = ['cffi>=1.15.0']
cffi_modules = ['./src/snappy/snappy_cffi_builder.py:ffi']

setup(
Expand Down