Fix building and testing issues (#467)

* update manifest to include new binaries

* correct manifest syntax

* make path explicit in build job

* remove explicit path

* add env variable

* another attempt

* remove old conditional

* try 14.0

* debugging run

* more debugging ideas

* fix debug steps

* adjust debug

* change env var before build wntr

* env var before python

* fix macos setting

* try forcing platform name

* fix syntax

* add testing step to install import

* add upper bound to plotly requirement

* checkout and install requirements.txt  for wntr wheel test

* test only one file since others break

* checkout tests folder for testing

* remove wheel testing. difficult to get working

* another testing attempt.

* another testing attempt.

* Remove test wheels, still buggy.

* Try including testing data in wheel

* attempt to set working directory

* another attempt

* fix libomp issue

* remove demos from wheel testing

* remove files and tests for demos/examples

Author: kbonney

.github/workflows/build_tests.yml

@@ -21,6 +21,13 @@ jobs:
         os: [windows-latest, macOS-13, macos-latest, ubuntu-latest]
       fail-fast: false
     steps:
+    - name: Macos debug and set deployment target variable
+      if: ${{ matrix.os == 'macOS-13'}}
+      run: |
+        xcodebuild -version
+        echo $MACOSX_DEPLOYMENT_TARGET
+        export MACOSX_DEPLOYMENT_TARGET=13.0
+        echo $MACOSX_DEPLOYMENT_TARGET
     - uses: actions/checkout@v4
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -31,10 +38,16 @@ jobs:
         python --version
         python -m pip install --upgrade pip
         pip install wheel
-        pip install -r requirements.txt
-    - name: Build wheel
+        pip install -r requirements.txt  
+    - name: Build macOS-13 # Special case due to unresolved wheel naming bug.
+      if: ${{ matrix.os == 'macOS-13'}}
+      run: |
+        python setup.py bdist_wheel --plat-name macosx-13.0-universal2 --verbose
+        ls dist/*
+    - name: Build all other OS
+      if: ${{ matrix.os != 'macOS-13'}}
       run: |
-        python setup.py bdist_wheel
+        python setup.py bdist_wheel --verbose
         ls dist/*
     - name: Save wheel
       uses: actions/upload-artifact@v4
@@ -64,10 +77,26 @@ jobs:
         python -m pip install --upgrade pip
         pip install wheel "numpy>=1.2.1,<2.0" scipy networkx pandas matplotlib setuptools
         pip install --no-index --pre --find-links=. wntr
-    - name: Usage of wntr
+    - name: Import wntr
       run: |
         python -c "import wntr"
-
+    - name: Checkout requirements.txt
+      uses: actions/checkout@v4
+      with:
+        sparse-checkout: |
+          requirements.txt
+          wntr/tests/
+          examples/
+          wntr/epanet/libepanet/darwin-formula/libomp.rb
+        sparse-checkout-cone-mode: false
+        fetch-depth: 1
+    - if: ${{ matrix.os == 'macos-latest' || matrix.os == 'macOS-13'}}
+      run: |
+        brew reinstall --build-from-source --formula wntr/epanet/libepanet/darwin-formula/libomp.rb
+    - name: Test wntr
+      run: |
+        pip install -r requirements.txt
+        pytest wntr/tests/ --ignore=wntr/tests/test_demos.py --ignore=wntr/tests/test_examples.py
   pytest_coverage:
     runs-on: ${{ matrix.os }}
     strategy:

MANIFEST.in

@@ -1,13 +1,14 @@
 include README.md
 include LICENSE.md
-include wntr/epanet/Darwin/*
-include wntr/epanet/Linux/*
-include wntr/epanet/Windows/*
+include wntr/epanet/libepanet/darwin-arm/*
+include wntr/epanet/libepanet/darwin-formula/*
+include wntr/epanet/libepanet/darwin-x64/*
+include wntr/epanet/libepanet/linux-x64/*
+include wntr/epanet/libepanet/windows-x64/*
 include wntr/sim/aml/evaluator*
 include wntr/sim/aml/numpy.i
 include wntr/sim/network_isolation/network_isolation*
 include wntr/sim/network_isolation/numpy.i
 include wntr/tests/networks_for_testing/*.inp
 include wntr/library/msx/*.json
 include wntr/library/msx/*.msx
-include wntr/epanet/libepanet/darwin-formula/libomp.rb

requirements.txt

@@ -7,7 +7,7 @@ matplotlib
 setuptools
 
 # Optional
-plotly
+plotly<6.0
 folium
 utm
 openpyxl