Merge pull request #57 from OpenWaterAnalytics/dev

Linux wheel repair

Author: michaeltryby

.github/workflows/python-package.yml

@@ -36,6 +36,13 @@ jobs:
       - name: Build wheel
         run: pip wheel --wheel-dir=./dist ./swmm-toolkit
 
+      - name: Repair wheel
+        if: ${{ contains(matrix.os, 'ubuntu') }}
+        run: |
+          pip install auditwheel
+          auditwheel repair ./dist/*-linux_x86_64.whl --plat "manylinux2014_x86_64" -w ./dist 
+          rm -rf ./dist/*-linux_x86_64.whl
+
       - name: Test wheel
         run: |
           pip install pytest numpy

swmm-toolkit/AUTHORS

@@ -3,3 +3,4 @@
 Michael Tryby <[email protected]> (public domain)
 Jennifer Wu <[email protected]>
 Caleb Buahin <[email protected]>
+Laurent Courty <[email protected]>

swmm-toolkit/CMakeLists.txt

@@ -10,7 +10,10 @@
 
 cmake_minimum_required (VERSION 3.17)
 
-project(swmm-toolkit)
+project(swmm-toolkit
+    VERSION
+        0.8.0
+)
 
 
 set(Python_EXECUTABLE ${PYTHON_EXECUTABLE})

swmm-toolkit/src/swmm/toolkit/CMakeLists.txt

@@ -2,7 +2,7 @@
 # CMakeLists.txt - CMake configuration file for swmm.toolkit python package
 #
 # Created:   Feb 6, 2020
-# Updated:   May 6, 2020
+# Updated:   Dec 29, 2020
 #
 #  Author:   See AUTHORS
 #
@@ -27,7 +27,10 @@ else()
     set(LIB_ROOT "$ORIGIN")
 endif()
 
-set(PACKAGE_RPATH "${LIB_ROOT}/../../../..;${LIB_ROOT}/../../../../extern;${LIB_ROOT}/../../../lib")
+# Inserting line continuation '\' in this long path string breaks wheel repair
+set(PACKAGE_RPATH 
+    "${LIB_ROOT}/../../../..;${LIB_ROOT}/../../../../extern;${LIB_ROOT}/../../../lib;${LIB_ROOT}/../../swmm_toolkit-${CMAKE_PROJECT_VERSION}.data/data/lib"
+)
 
 
 #############################################################