Merge pull request #985 from darshan-hpc/snyder/bump-cibuildwheel-2.17.0

CI: bump cibuildwheel, drop 3.7 testing
darshan-hpc · May 1, 2024 · 806bf64 · 806bf64
2 parents a01ab69 + 195a3bf
commit 806bf64
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -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
 

diff --git a/.github/workflows/main_ci.yml b/.github/workflows/main_ci.yml
@@ -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
@@ -37,6 +37,7 @@ jobs:
         name: Install MacOS deps
         run: |
           brew install automake
+          brew install libtool
       - name: Install darshan-util
         run: |
           mkdir darshan_install

diff --git a/darshan-util/pydarshan/pyproject.toml b/darshan-util/pydarshan/pyproject.toml
@@ -63,9 +63,8 @@ include = ["darshan"]
 version = {attr = "darshan.__version__"}
 
 [tool.cibuildwheel]
-environment = "PYDARSHAN_BUILD_EXT=1"
 skip = [
-    "cp36-*",
+    "cp37-*",
     "pp*",
     "*musllinux*",
     "*i686*",
@@ -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