simplify dependencies

openmm · Apr 26, 2024 · c6d7e91 · c6d7e91
1 parent cd998f6
commit c6d7e91
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/recipe/.meta.yaml.swp b/recipe/.meta.yaml.swp
diff --git a/recipe/build_openmm.bat b/recipe/build_openmm.bat
@@ -40,7 +40,7 @@ dir dist
 for %%f in (dist\*.whl) do (
   echo "fixing %%f"
   cd %LIBRARY_PREFIX%
-  %PYTHON% ^
+  %BUILD_PREFIX%\python.exe ^
       %RECIPE_DIR%\vendor_wheel.py ^
       %SRC_DIR%\build\python\%%f ^
       include\openmm ^
@@ -72,7 +72,7 @@ cd %SRC_DIR%\build\python
 for %%f in (dist\*.whl) do (
   echo "fixing %%f"
   cd %LIBRARY_PREFIX%
-  %PYTHON% ^
+  %BUILD_PREFIX%\python.exe ^
       %RECIPE_DIR%\vendor_wheel.py ^
       %SRC_DIR%\build\python\%%f ^
       lib\plugins\OpenMMCUDA.dll ^

diff --git a/recipe/build_openmm.sh b/recipe/build_openmm.sh
@@ -103,7 +103,7 @@ for whl in $PWD/dist/*.whl; do
         plugins="$plugins $plugin"
       fi
     done
-    $PREFIX/bin/python \
+    $BUILD_PREFIX/bin/python${PY_VER} $(which delocate-wheel) \
       $RECIPE_DIR/vendor_wheel.py \
       $whl \
       include/openmm \
@@ -145,7 +145,7 @@ function repair() {
       --exclude libnvrtc.so.12 \
       --lib-sdir=$LIB_SDIR
   else
-    $PYTHON $(which delocate-wheel) \
+    $BUILD_PREFIX/bin/python${PY_VER} $(which delocate-wheel) \
       -w fixed_wheels \
       --sanitize-rpaths \
       -v \

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -64,6 +64,10 @@ requirements:
     # START WHEEL CHANGES
     - unzip           # [unix]
     - patchelf        # [linux]
+    - auditwheel      # [linux]
+    - setuptools      # [linux]
+    - delocate >=0.10.6
+    - pip
     # END WHEEL CHANGES
 
   host:
@@ -86,13 +90,6 @@ requirements:
     # No cuda-driver-dev in windows
     - cuda-driver-dev  # [linux]
     {% endif %}
-    # START WHEEL CHANGES
-    - auditwheel      # [linux]
-    - setuptools      # [linux]
-    - delocate >=0.10.6
-    - pip
-    - macholib
-    # END WHEEL CHANGES
   run:
     - python
     - numpy