Skip to content

Commit

Permalink
Merge pull request #111 from VROOM-Project/apple-silicon
Browse files Browse the repository at this point in the history
moving back to manylinux2014
  • Loading branch information
jonathf authored Jun 26, 2024
2 parents b03aac1 + de44cd4 commit da2c48d
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
- uses: pypa/[email protected]
env:
MACOSX_DEPLOYMENT_TARGET: 10.14
CIBW_BUILD: '*cp311*'
CIBW_BUILD: '*cp39*'

- name: Verify clean directory
run: git diff --exit-code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: "3.11"
python-version: "3.9"

- name: "Install system dependencies"
run: sudo apt update -y && sudo apt install -y libssl-dev libasio-dev
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,18 @@ jobs:
conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data"
conan install --build=openssl --install-folder conan_build .
# - name: Set up QEMU
# if: matrix.platform == 'linux'
# uses: docker/setup-qemu-action@v3
# with:
# platforms: all
- name: Set up QEMU
if: matrix.platform == 'linux'
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Build wheels
if: matrix.platform != 'macos-arm'
uses: pypa/[email protected]
env:
MACOSX_DEPLOYMENT_TARGET: 13.0
CIBW_ARCHS_LINUX: x86_64 aarch64

- name: Build wheels
if: matrix.platform == 'macos-arm'
Expand Down
10 changes: 10 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,16 @@ Installation of the pre-compiled releases should be as simple as:
pip install pyvroom
The current minimal requirements are as follows:

* Python at least version 3.9.
* Intel MacOS (or Rosetta2) at least version 13.0.
* Apple Silicon MacOS at least version 14.0.
* Windows on AMD64.
* Linux on x86_64 and Aarch64 given glibc at least version 2.28.

Outside this it might be possible to build your own binaries.

Building from source
====================

Expand Down
8 changes: 5 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ build = "cp3{9,10,11,12}-*"
skip = "*musllinux*"
archs = "native"
manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64"
manylinux-aarch64-image = "quay.io/pypa/manylinux_2_28_aarch64"

[tool.cibuildwheel.linux]
before-all = """
yum module enable mariadb-devel:10.3
yum install -y openssl-devel asio
dnf update -y
dnf module enable -y mariadb-devel
dnf install -y openssl-devel asio-devel
"""
# archs = ["auto", "aarch64"]
archs = ["x86_64", "aarch64"]

[[tool.cibuildwheel.overrides]]
select = "*musllinux*"
Expand Down

0 comments on commit da2c48d

Please sign in to comment.