Moved pip to helics-pip

.github/workflows/pythonpackage.yml

@@ -13,9 +13,9 @@ jobs:
     - uses: actions/checkout@v1
     - name: Create wheels
       run: |
-        source ./pip/packaging_scripts/setup-Linux.sh "$(cat HELICS_VERSION)"
-        ./pip/packaging_scripts/build-Linux.sh
-        ./pip/packaging_scripts/repair-Linux.sh
+        source ./helics-pip/packaging_scripts/setup-Linux.sh "$(cat HELICS_VERSION)"
+        ./helics-pip/packaging_scripts/build-Linux.sh
+        ./helics-pip/packaging_scripts/repair-Linux.sh
     - uses: actions/upload-artifact@v1
       with:
         name: python-dist
@@ -30,9 +30,9 @@ jobs:
       run: ./.github/workflows/setup-macos-10.9-sdk.sh
     - name: Create wheels
       run: |
-        source ./pip/packaging_scripts/setup-macOS.sh "$(cat HELICS_VERSION)"
-        ./pip/packaging_scripts/build-macOS.sh
-        ./pip/packaging_scripts/repair-macOS.sh
+        source ./helics-pip/packaging_scripts/setup-macOS.sh "$(cat HELICS_VERSION)"
+        ./helics-pip/packaging_scripts/build-macOS.sh
+        ./helics-pip/packaging_scripts/repair-macOS.sh
       shell: bash
     - uses: actions/upload-artifact@v1
       with:
@@ -53,9 +53,9 @@ jobs:
     - uses: actions/checkout@v2
     - name: Create wheels
       run: |
-        source ./pip/packaging_scripts/setup-Windows.sh "$(cat HELICS_VERSION)" "${{ matrix.winarch }}"
-        ./pip/packaging_scripts/build-Windows.sh "${{ matrix.arch }}"
-        ./pip/packaging_scripts/repair-Windows.sh
+        source ./helics-pip/packaging_scripts/setup-Windows.sh "$(cat HELICS_VERSION)" "${{ matrix.winarch }}"
+        ./helics-pip/packaging_scripts/build-Windows.sh "${{ matrix.arch }}"
+        ./helics-pip/packaging_scripts/repair-Windows.sh
       shell: bash
     - uses: actions/upload-artifact@v1
       with:
@@ -69,15 +69,15 @@ jobs:
     - name: Build source distribution
       run: |
         HELICS_VERSION=$(cat HELICS_VERSION)
-        mkdir -p pip/bundled/helics
+        mkdir -p helics-pip/bundled/helics
         curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-v${HELICS_VERSION}-source.tar.gz" || exit $?
-        tar xzf Helics-*.tar.gz -C pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
-        cd pip || exit $?
+        tar xzf Helics-*.tar.gz -C helics-pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
+        cd helics-pip || exit $?
         python setup.py sdist
     - uses: actions/upload-artifact@v1
       with:
         name: python-dist
-        path: pip/dist
+        path: helics-pip/dist
 
   publish:
     needs: [build-sdist, build-linux, build-macos, build-windows]

helics-pip/packaging_scripts/HELICS_VERSION

@@ -0,0 +1 @@
+2.4.1

pip/packaging_scripts/build-Linux.sh → helics-pip/packaging_scripts/build-Linux.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Compile wheels
-pushd pip
+pushd helics-pip || exit $?
 for PYBIN in /opt/python/cp3*/bin; do
   "${PYBIN}/python" setup.py bdist_wheel --dist-dir=../wheelhouse
 done
@@ -10,5 +10,5 @@ PATH="$HOME/swig-install/bin:$PATH"
 for PYBIN in /opt/python/cp2*/bin; do
   "${PYBIN}/python" setup.py bdist_wheel --dist-dir=../wheelhouse
 done
-popd
+popd || exit $?
 

pip/packaging_scripts/build-Windows.sh → helics-pip/packaging_scripts/build-Windows.sh

@@ -8,7 +8,7 @@ export CMAKE_PREFIX_PATH
 bash_runner_tool_cache=$(echo "/${RUNNER_TOOL_CACHE}" | sed -e 's/\\/\//g' -e 's/://')
 
 # Compile wheels
-pushd pip || exit $?
+pushd helics-pip || exit $?
 OLD_PATH=$PATH
 for PYDIR in "${bash_runner_tool_cache}"/Python/3*/"${WINARCH}"; do
   pythonLocation="${PYDIR}"

pip/packaging_scripts/build-macOS.sh → helics-pip/packaging_scripts/build-macOS.sh

@@ -2,7 +2,7 @@
 
 export CMAKE_PREFIX_PATH
 
-pushd pip || exit $?
+pushd helics-pip || exit $?
 OLD_PATH=$PATH
 for PYDIR in "${RUNNER_TOOL_CACHE}"/Python/3*/x64; do
   pythonLocation="${PYDIR}"
@@ -15,6 +15,7 @@ for PYDIR in "${RUNNER_TOOL_CACHE}"/Python/3*/x64; do
   python setup.py bdist_wheel --dist-dir=../wheelhouse
 done
 
+# Swig is already installed on macOS
 brew install swig
 for PYDIR in "${RUNNER_TOOL_CACHE}"/Python/2*/x64; do
   pythonLocation="${PYDIR}"

pip/packaging_scripts/setup-Linux.sh → helics-pip/packaging_scripts/setup-Linux.sh

@@ -26,6 +26,6 @@ CMAKE_PREFIX_PATH="${PWD}/helics"
 export CMAKE_PREFIX_PATH
 
 # Add a copy of HELICS to the bundled folder for building the Python wheel
-mkdir -p pip/bundled/helics
+mkdir -p helics-pip/bundled/helics
 curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-v${HELICS_VERSION}-source.tar.gz" || exit $?
-tar xzf Helics-*.tar.gz -C pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
+tar xzf Helics-*.tar.gz -C helics-pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?

pip/packaging_scripts/setup-Windows.sh → helics-pip/packaging_scripts/setup-Windows.sh

@@ -8,9 +8,9 @@ curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSI
 tar xzf Helics-*.tar.gz && rm Helics-*.tar.gz && mv Helics-* helics || exit $?
 
 # Add a copy of HELICS to the bundled folder for building the Python wheel
-mkdir -p pip/bundled/helics
+mkdir -p helics-pip/bundled/helics
 curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-v${HELICS_VERSION}-source.tar.gz" || exit $?
-tar xzf Helics-*.tar.gz -C pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
+tar xzf Helics-*.tar.gz -C helics-pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
 
 mkdir wheelhouse
 

pip/packaging_scripts/setup-macOS.sh → helics-pip/packaging_scripts/setup-macOS.sh

@@ -7,9 +7,9 @@ curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSI
 tar xzf Helics-*.tar.gz && rm Helics-*.tar.gz && mv Helics-* helics || exit $?
 
 # Add a copy of HELICS to the bundled folder for building the Python wheel
-mkdir -p pip/bundled/helics
+mkdir -p helics-pip/bundled/helics
 curl -O -L "https://github.com/GMLC-TDC/HELICS/releases/download/v${HELICS_VERSION}/Helics-v${HELICS_VERSION}-source.tar.gz" || exit $?
-tar xzf Helics-*.tar.gz -C pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
+tar xzf Helics-*.tar.gz -C helics-pip/bundled/helics/ && rm Helics-*.tar.gz || exit $?
 
 # Set the CMAKE_PREFIX_PATH environment variable in GitHub Actions
 CMAKE_PREFIX_PATH="${PWD}/helics"