From c26da018b7b74ec4d28e5aad91076ac8cf9716ef Mon Sep 17 00:00:00 2001 From: Kirk Bonney <47759761+kbonney@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:30:28 -0400 Subject: [PATCH 1/4] add max version for fiona geopandas uses apparently deprecated fiona call which causes breakage, requiring fiona below 1.10 prevents this. --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 8ffd8b319..da4347a42 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,7 @@ folium utm openpyxl geopandas<1.0 +fiona<1.10 rtree # Documentation From 83d4c912864ca5234e28d5473791dc60d303e20f Mon Sep 17 00:00:00 2001 From: Kirk Bonney <47759761+kbonney@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:23:21 -0400 Subject: [PATCH 2/4] increase download artifact version --- .github/workflows/build_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index 4f067327d..bd1f67d7c 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -56,7 +56,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Download wheel - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4.1.7 with: name: wntr_${{ matrix.python-version }}_${{ matrix.os }}.whl - name: Install wntr @@ -117,7 +117,7 @@ jobs: python -m pip install -e . # pip install coveralls - name: Download coverage artifacts from test matrix - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4.1.7 with: name: coverage - name: Setup coverage and combine reports @@ -163,7 +163,7 @@ jobs: pip install -r requirements.txt python -m pip install -e . - name: Download coverage artifacts from test matrix - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4.1.7 with: name: coverage - name: Setup coverage and combine reports From 1e47f0f98421ab582371f93eb52a14e544233a68 Mon Sep 17 00:00:00 2001 From: Kirk Bonney <47759761+kbonney@users.noreply.github.com> Date: Mon, 23 Sep 2024 12:28:44 -0400 Subject: [PATCH 3/4] Upgrade upload artifact version --- .github/workflows/build_tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index bd1f67d7c..eac7ca96b 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -37,7 +37,7 @@ jobs: python setup.py bdist_wheel ls dist/* - name: Save wheel - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4.4.0 with: name: wntr_${{ matrix.python-version }}_${{ matrix.os }}.whl path: dist/wntr* @@ -96,7 +96,7 @@ jobs: COVERAGE_FILE: .coverage.${{ matrix.python-version }}.${{ matrix.os }} - name: Save coverage - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.4.0 with: name: coverage path: .coverage.${{ matrix.python-version }}.${{ matrix.os }} @@ -136,12 +136,12 @@ jobs: coverage json --pretty-print coverage html --show-contexts - name: Save coverage JSON - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.4.0 with: name: coverage path: coverage.json - name: Save coverage html - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4.4.0 with: name: coverage path: htmlcov From e26dd6449a16135a0f40428494361251db0603ef Mon Sep 17 00:00:00 2001 From: Kirk Bonney <47759761+kbonney@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:07:15 -0400 Subject: [PATCH 4/4] Removing minor version specification from actions to solve compatibility issues --- .github/workflows/build_tests.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml index eac7ca96b..316247eae 100644 --- a/.github/workflows/build_tests.yml +++ b/.github/workflows/build_tests.yml @@ -37,7 +37,7 @@ jobs: python setup.py bdist_wheel ls dist/* - name: Save wheel - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4 with: name: wntr_${{ matrix.python-version }}_${{ matrix.os }}.whl path: dist/wntr* @@ -56,7 +56,7 @@ jobs: with: python-version: ${{ matrix.python-version }} - name: Download wheel - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: wntr_${{ matrix.python-version }}_${{ matrix.os }}.whl - name: Install wntr @@ -96,7 +96,7 @@ jobs: COVERAGE_FILE: .coverage.${{ matrix.python-version }}.${{ matrix.os }} - name: Save coverage - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4 with: name: coverage path: .coverage.${{ matrix.python-version }}.${{ matrix.os }} @@ -117,7 +117,7 @@ jobs: python -m pip install -e . # pip install coveralls - name: Download coverage artifacts from test matrix - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: coverage - name: Setup coverage and combine reports @@ -136,12 +136,12 @@ jobs: coverage json --pretty-print coverage html --show-contexts - name: Save coverage JSON - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4 with: name: coverage path: coverage.json - name: Save coverage html - uses: actions/upload-artifact@v4.4.0 + uses: actions/upload-artifact@v4 with: name: coverage path: htmlcov @@ -163,7 +163,7 @@ jobs: pip install -r requirements.txt python -m pip install -e . - name: Download coverage artifacts from test matrix - uses: actions/download-artifact@v4.1.7 + uses: actions/download-artifact@v4 with: name: coverage - name: Setup coverage and combine reports