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.

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

CI: bump cibuildwheel, drop 3.7 testing #985

Merged
merged 6 commits into from
May 1, 2024
Merged

CI: bump cibuildwheel, drop 3.7 testing #985

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
93b2672
bump cibuildwheel to 2.17 [wheel build]
shanedsnyder Apr 26, 2024
2bd7661
bump cibuildwheel version, drop 3.7 testing [wheel build]
shanedsnyder Apr 26, 2024
9ef9904
set macos cibuildwheel environment properly [wheel build]
shanedsnyder Apr 30, 2024
8da52c9
set macos DYLD_FALLBACK_LIBRARY_PATH [wheel build]
shanedsnyder Apr 30, 2024
fdc2185
don't build wheels for python 3.7
shanedsnyder May 1, 2024
195a3bf
add macos-13 to cibuildwheel matrix [wheel build]
shanedsnyder May 1, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- 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
View file
Open in desktop
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
26 changes: 20 additions & 6 deletions darshan-util/pydarshan/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ include = ["darshan"]
version = {attr = "darshan.__version__"}

[tool.cibuildwheel]
environment = "PYDARSHAN_BUILD_EXT=1"
skip = [
"cp36-*",
"pp*",
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