Skip to content
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.

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

CI: bump cibuildwheel, drop 3.7 testing #985

Merged
merged 6 commits into from
May 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-latest, macos-13]

steps:
- uses: actions/checkout@v2

- name: Build wheels
uses: pypa/cibuildwheel@v2.11.2
uses: pypa/cibuildwheel@v2.17.0
with:
package-dir: ./darshan-util/pydarshan

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/main_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
matrix:
platform: [ubuntu-latest,
macos-latest]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
Expand All @@ -37,6 +37,7 @@ jobs:
name: Install MacOS deps
run: |
brew install automake
brew install libtool
- name: Install darshan-util
run: |
mkdir darshan_install
Expand Down
28 changes: 21 additions & 7 deletions darshan-util/pydarshan/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ include = ["darshan"]
version = {attr = "darshan.__version__"}

[tool.cibuildwheel]
environment = "PYDARSHAN_BUILD_EXT=1"
skip = [
"cp36-*",
"cp37-*",
"pp*",
"*musllinux*",
"*i686*",
Expand All @@ -90,22 +89,37 @@ before-all = [
"yum install -y libjpeg libjpeg-devel",
"git submodule update --init",
"./prepare.sh",
"./configure --disable-darshan-runtime --enable-apxc-mod --enable-apmpi-mod",
"./configure --prefix=$PWD/darshan_install --disable-darshan-runtime --enable-apxc-mod --enable-apmpi-mod",
"make install"
]
repair-wheel-command = "auditwheel repair -w {dest_dir} {wheel}"
repair-wheel-command = [
"auditwheel repair -w {dest_dir} {wheel}"
]

[tool.cibuildwheel.linux.environment]
DARSHAN_LIBRARY_PATH="$PWD/darshan_install/lib"
LIBRARY_PATH="$LIBRARY_PATH:$DARSHAN_LIBRARY_PATH"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$DARSHAN_LIBRARY_PATH"
PYDARSHAN_BUILD_EXT=1

[tool.cibuildwheel.macos]
before-all = [
"brew install automake",
"brew install libtool",
"brew install openblas",
"brew install lapack",
"git submodule update --init",
"./prepare.sh",
"./configure --disable-darshan-runtime --enable-apxc-mod --enable-apmpi-mod",
"./configure --prefix=$PWD/darshan_install --disable-darshan-runtime --enable-apxc-mod --enable-apmpi-mod",
"make install"
]
repair-wheel-command = [
"delocate-listdeps {wheel}",
"delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}",
"delocate-listdeps {wheel}",
"delocate-wheel --require-archs {delocate_archs} -w {dest_dir} {wheel}"
]

[tool.cibuildwheel.macos.environment]
DARSHAN_LIBRARY_PATH="$PWD/darshan_install/lib"
LIBRARY_PATH="$LIBRARY_PATH:$DARSHAN_LIBRARY_PATH"
DYLD_FALLBACK_LIBRARY_PATH="$DYLD_FALLBACK_LIBRARY_PATH:$DARSHAN_LIBRARY_PATH"
PYDARSHAN_BUILD_EXT=1
Loading