From bf6e37a2cc014877991d902acf8b724f7f7bab29 Mon Sep 17 00:00:00 2001 From: Ryan Mast Date: Fri, 2 Feb 2024 23:18:45 -0800 Subject: [PATCH] Remove old packaging_scripts for helics_apps --- .../packaging_scripts/build-Linux.sh | 7 ------- .../packaging_scripts/build-Windows.sh | 8 -------- .../packaging_scripts/build-macOS.sh | 8 -------- .../packaging_scripts/repair-Linux.sh | 7 ------- .../packaging_scripts/repair-Windows.sh | 19 ------------------ .../packaging_scripts/repair-macOS.sh | 15 -------------- .../packaging_scripts/setup-Linux.sh | 20 ------------------- .../packaging_scripts/setup-Windows.sh | 18 ----------------- .../packaging_scripts/setup-macOS.sh | 20 ------------------- 9 files changed, 122 deletions(-) delete mode 100755 helics_apps-pip/packaging_scripts/build-Linux.sh delete mode 100755 helics_apps-pip/packaging_scripts/build-Windows.sh delete mode 100755 helics_apps-pip/packaging_scripts/build-macOS.sh delete mode 100755 helics_apps-pip/packaging_scripts/repair-Linux.sh delete mode 100755 helics_apps-pip/packaging_scripts/repair-Windows.sh delete mode 100755 helics_apps-pip/packaging_scripts/repair-macOS.sh delete mode 100755 helics_apps-pip/packaging_scripts/setup-Linux.sh delete mode 100755 helics_apps-pip/packaging_scripts/setup-Windows.sh delete mode 100755 helics_apps-pip/packaging_scripts/setup-macOS.sh diff --git a/helics_apps-pip/packaging_scripts/build-Linux.sh b/helics_apps-pip/packaging_scripts/build-Linux.sh deleted file mode 100755 index 043ab9d..0000000 --- a/helics_apps-pip/packaging_scripts/build-Linux.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Create the wheel -pushd helics_apps-pip || exit $? -python setup.py bdist_wheel --dist-dir=../wheelhouse -popd || exit $? - diff --git a/helics_apps-pip/packaging_scripts/build-Windows.sh b/helics_apps-pip/packaging_scripts/build-Windows.sh deleted file mode 100755 index 8d6b1b3..0000000 --- a/helics_apps-pip/packaging_scripts/build-Windows.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -PLAT_NAME=$1 - -# Create the wheel -pushd helics_apps-pip || exit $? -python setup.py bdist_wheel --plat-name="$PLAT_NAME" --dist-dir=../wheelhouse --verbose -popd || exit $? diff --git a/helics_apps-pip/packaging_scripts/build-macOS.sh b/helics_apps-pip/packaging_scripts/build-macOS.sh deleted file mode 100755 index 4def069..0000000 --- a/helics_apps-pip/packaging_scripts/build-macOS.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -PLAT_NAME=$1 - -# Create the wheel -pushd helics_apps-pip || exit $? -python setup.py bdist_wheel --plat-name="$PLAT_NAME" --dist-dir=../wheelhouse -popd || exit $? diff --git a/helics_apps-pip/packaging_scripts/repair-Linux.sh b/helics_apps-pip/packaging_scripts/repair-Linux.sh deleted file mode 100755 index ae062ab..0000000 --- a/helics_apps-pip/packaging_scripts/repair-Linux.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Bundle external shared libraries into the wheel -for whl in wheelhouse/*.whl; do - python -m auditwheel repair "$whl" --plat manylinux2010_x86_64 -w upload-wheelhouse -done - diff --git a/helics_apps-pip/packaging_scripts/repair-Windows.sh b/helics_apps-pip/packaging_scripts/repair-Windows.sh deleted file mode 100755 index 1c42850..0000000 --- a/helics_apps-pip/packaging_scripts/repair-Windows.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -mkdir upload-wheelhouse - -# Install wheel module for fixing up the wheels -python -m pip install --upgrade pip -python -m pip install wheel - -# Bundle external shared libraries -for whl in $PWD/wheelhouse/*.whl; do - mkdir tmp_dir - pushd tmp_dir - wheel unpack "$whl" - #cp ../helics/bin/libzmq*.dll helics-*/helics - wheel pack helics_apps-*/ --dest-dir=../upload-wheelhouse - popd - rm -rf tmp_dir -done - diff --git a/helics_apps-pip/packaging_scripts/repair-macOS.sh b/helics_apps-pip/packaging_scripts/repair-macOS.sh deleted file mode 100755 index e4993bd..0000000 --- a/helics_apps-pip/packaging_scripts/repair-macOS.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -DYLD_LIBRARY_PATH="$PWD/helics/lib:$PWD/helics/lib64:$DYLD_LIBRARY_PATH" -export DYLD_LIBRARY_PATH - -# Ensure delocate and wheel are installed for fixing up wheels -python -m pip install --upgrade pip -pip install delocate wheel - -# Bundle external shared libraries into the wheels -for whl in wheelhouse/*.whl; do - newwhl="${whl%%macos*.whl}macosx_10_14_universal2.macosx_10_14_x86_64.macosx_11_0_arm64.whl" - mv "$whl" "$newwhl" - delocate-wheel -v "$newwhl" -w upload-wheelhouse -done diff --git a/helics_apps-pip/packaging_scripts/setup-Linux.sh b/helics_apps-pip/packaging_scripts/setup-Linux.sh deleted file mode 100755 index 4759b19..0000000 --- a/helics_apps-pip/packaging_scripts/setup-Linux.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -HELICS_VERSION=$1 - -# Get HELICS apps for Linux -curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-${HELICS_VERSION}-Linux-x86_64.tar.gz" -tar xzf Helics-*.tar.gz && rm Helics-*.tar.gz && mv Helics-* helics || exit $? - -# Add a copy of HELICS binaries to the data folder -cp helics/bin/helics_* helics_apps-pip/helics_apps/data/bin/ - -# Add lib64 to LD_LIBRARY_PATH so auditwheel can fix up the bdist wheel -LD_LIBRARY_PATH="$PWD/helics/lib64:$LD_LIBRARY_PATH" -export LD_LIBRARY_PATH - -# Make sure pip and required tools are set up -pip install --upgrade pip -pip install setuptools wheel auditwheel - -sudo apt-get install -y patchelf diff --git a/helics_apps-pip/packaging_scripts/setup-Windows.sh b/helics_apps-pip/packaging_scripts/setup-Windows.sh deleted file mode 100755 index 1f1e6b8..0000000 --- a/helics_apps-pip/packaging_scripts/setup-Windows.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -HELICS_VERSION=$1 -WINARCH=$2 - -# Get HELICS apps for Windows -curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-${HELICS_VERSION}-${WINARCH}.zip" -unzip Helics-*.zip && rm Helics-*.zip && mv Helics-* helics || exit $? - -# Add a copy of HELICS binaries to the data folder -cp helics/bin/helics_* helics_apps-pip/helics_apps/data/bin/ - -# Make sure pip and required tools are set up -pip install --user --upgrade pip -pip install --user setuptools wheel - -mkdir wheelhouse - diff --git a/helics_apps-pip/packaging_scripts/setup-macOS.sh b/helics_apps-pip/packaging_scripts/setup-macOS.sh deleted file mode 100755 index b925eca..0000000 --- a/helics_apps-pip/packaging_scripts/setup-macOS.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -HELICS_VERSION=$1 - -# Get HELICS apps for macOS -curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-${HELICS_VERSION}-macOS-universal2.zip" -unzip Helics-*.zip && rm Helics-*.zip && mv Helics-* helics || exit $? - -# Add a copy of HELICS binaries to the data folder -cp helics/bin/helics_* helics_apps-pip/helics_apps/data/bin/ - -# Make sure pip and required tools are set up -pip install --upgrade pip -pip install setuptools wheel - -# Set the DYLD_LIBRARY_PATH in GitHub Actions so delocate can fix up the wheel -DYLD_LIBRARY_PATH="${PWD}/helics/lib:${PWD}/helics/lib64:$DYLD_LIBRARY_PATH" -export DYLD_LIBRARY_PATH -echo "DYLD_LIBRARY_PATH=$PWD/helics/lib:$PWD/helics/lib64:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV -