Merge remote-tracking branch 'jpy-consortium/master' into devinrsmith…

…-github-actions-dependabot
jpy-consortium · Mar 13, 2024 · 07e1624 · 07e1624
2 parents d775c65 + 03e5316
commit 07e1624
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git a/.github/env/Linux/auditwheel-keep-libjvm.py b/.github/env/Linux/auditwheel-keep-libjvm.py
diff --git a/.github/env/Linux/bdist-wheel.sh b/.github/env/Linux/bdist-wheel.sh
@@ -12,9 +12,10 @@ python -m pip install -r "${__dir}/requirements.txt"
 python setup.py bdist_wheel --dist-dir dist.linux
 
 # Note: auditwheel only works with a single file argument - we are relying on finding exactly one wheel
-python "${__dir}/auditwheel-keep-libjvm.py" \
+auditwheel \
   repair \
   --plat "manylinux_2_17_$(arch)" \
   --only-plat \
+  --exclude libjvm.so \
   --wheel-dir dist/ \
   dist.linux/*
diff --git a/.github/env/Linux/requirements.txt b/.github/env/Linux/requirements.txt
@@ -1,4 +1,6 @@
 setuptools
 wheel
-auditwheel
+auditwheel>=6.0.0; python_version >= '3.8'
+auditwheel>=5.4.0; python_version == '3.7'
+auditwheel>=5.3.0; python_version == '3.6'
 patchelf