Skip to content

Commit

Permalink
updates, asio bundle and apple silicon support
Browse files Browse the repository at this point in the history
  • Loading branch information
jonathf committed Jun 25, 2024
1 parent 590a7d8 commit 847f995
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 30 deletions.
15 changes: 8 additions & 7 deletions .github/workflows/main_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ jobs:
include:
- image: ubuntu-latest
platform: linux
- image: macos-latest
platform: macos
- image: macos-13
platform: macos-intel
- image: macos-14
platform: macos-arm
- image: windows-latest
platform: windows

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -36,7 +38,7 @@ jobs:
key: conan-${{ matrix.image }}-${{ hashFiles('conanfile.txt') }}

- name: Configure Python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
if: matrix.platform == 'windows' && steps.cache-conan.outputs.cache-hit != 'true'
with:
python-version: '3.x'
Expand All @@ -52,10 +54,9 @@ jobs:
conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data"
conan install --build=openssl --install-folder conan_build .
- uses: pypa/cibuildwheel@v2.15.0
- uses: pypa/cibuildwheel@v2.19.1
env:
MACOSX_DEPLOYMENT_TARGET: 10.14
CIBW_BUILD: '*cp37*'
CIBW_BUILD: '*cp311*'

- name: Verify clean directory
run: git diff --exit-code
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

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

- name: "Install system dependencies"
run: sudo apt update -y && sudo apt install -y libssl-dev libasio-dev
Expand All @@ -40,15 +40,15 @@ jobs:
run: make test

- name: "Upload python coverage"
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.codecov_token }}
files: 'coverage/coverage.xml'
flags: python
fail_ci_if_error: true

- name: "Upload binding coverage"
uses: codecov/codecov-action@v2
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.codecov_token }}
files: 'coverage/*.gcov'
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
name: sdist
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Build sdist
run: pipx run build --sdist
Expand All @@ -33,13 +33,15 @@ jobs:
include:
- image: ubuntu-latest
platform: linux
- image: macos-latest
platform: macos
- image: macos-13
platform: macos-intel
- image: macos-14
platform: macos-arm
- image: windows-latest
platform: windows

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive

Expand All @@ -54,7 +56,7 @@ jobs:
key: conan-${{ matrix.image }}-${{ hashFiles('conanfile.txt') }}

- name: Configure Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
if: matrix.platform == 'windows' && steps.cache-conan.outputs.cache-hit != 'true'
with:
python-version: '3.x'
Expand All @@ -70,9 +72,7 @@ jobs:
conan config set "storage.path=$env:GITHUB_WORKSPACE/conan_data"
conan install --build=openssl --install-folder conan_build .
- uses: pypa/[email protected]
env:
MACOSX_DEPLOYMENT_TARGET: 10.14
- uses: pypa/[email protected]

- name: Verify clean directory
run: git diff --exit-code
Expand All @@ -89,7 +89,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/setup-python@v2
- uses: actions/setup-python@v5

- uses: actions/download-artifact@v3
with:
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "vroom"]
path = vroom
url = https://github.com/VROOM-Project/vroom
[submodule "asio"]
path = asio
url = https://github.com/chriskohlhoff/asio
1 change: 1 addition & 0 deletions asio
Submodule asio added at 12e0ce
9 changes: 1 addition & 8 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,11 @@ manylinux-x86_64-image = "quay.io/pypa/manylinux_2_28_x86_64"
before-all = """
dnf update -y
dnf module enable -y mariadb-devel
dnf install -y openssl-devel asio-devel
dnf install -y openssl-devel
"""

[[tool.cibuildwheel.overrides]]
select = "*musllinux*"
before-all = """
apk add asio-dev
apk add openssl-dev
"""

[tool.cibuildwheel.macos]

before-all = """
brew install asio
"""
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"src",
os.path.join("vroom", "src"),
os.path.join("vroom", "include"),
os.path.join("vroom", "include", "cxxopts", "include")
os.path.join("vroom", "include", "cxxopts", "include"),
os.path.join("asio", "asio", "include"),
]
libraries = []
library_dirs = []
Expand Down

0 comments on commit 847f995

Please sign in to comment.