From 50b76e5a50ad4168289844507d7a37a8883f4200 Mon Sep 17 00:00:00 2001 From: awongel Date: Tue, 25 Feb 2025 15:21:16 -0800 Subject: [PATCH 1/4] Fix bug after split of run and write --- run_pypsa.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run_pypsa.py b/run_pypsa.py index 4d2307f..b88d23d 100644 --- a/run_pypsa.py +++ b/run_pypsa.py @@ -370,5 +370,5 @@ def write_result(network, case_dict, component_list, infile, outfile_suffix=""): # Run PyPSA n, c_dict, comp_list, comp_attrs = build_network(input_file) - run_pypsa(n, input_file, c_dict, comp_list) + run_pypsa(n, c_dict) write_result(n, c_dict, comp_list, input_file) From 92fb0e719dc47180c9208ddb224ca7cdd6dd5ae6 Mon Sep 17 00:00:00 2001 From: awongel Date: Tue, 25 Feb 2025 15:28:30 -0800 Subject: [PATCH 2/4] Update action artifact version --- .github/workflows/check_output.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check_output.yml b/.github/workflows/check_output.yml index e686de6..88bdb5a 100644 --- a/.github/workflows/check_output.yml +++ b/.github/workflows/check_output.yml @@ -16,12 +16,12 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive - name: Set up Python 3.10 - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: python-version: "3.10" @@ -47,7 +47,7 @@ jobs: python run_pypsa.py -f test/test_case.xlsx - name: Save xlsx artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: output_xlsx path: output_data/test_case/test_prefix.xlsx @@ -57,7 +57,7 @@ jobs: python test/test_compare_output.py # Uncomment this section to upload output file(s) at the end of this job - #- uses: actions/upload-artifact@v3 + #- uses: actions/upload-artifact@v4 # with: # name: my-artifact # path: test_output.txt From dbc062d8549bf1265fb8507f17e8a2f03fb2cc32 Mon Sep 17 00:00:00 2001 From: awongel Date: Tue, 25 Feb 2025 15:48:32 -0800 Subject: [PATCH 3/4] Fix PyPSA version in action --- .github/workflows/check_output.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_output.yml b/.github/workflows/check_output.yml index 88bdb5a..701371a 100644 --- a/.github/workflows/check_output.yml +++ b/.github/workflows/check_output.yml @@ -28,7 +28,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install pypsa + python -m pip install pypsa==0.31.1 python -m pip install pandas python -m pip install openpyxl python -m pip install gurobipy From 32b2de14eee64bcfd68118ebc16f56178ad341c6 Mon Sep 17 00:00:00 2001 From: awongel Date: Tue, 25 Feb 2025 15:55:58 -0800 Subject: [PATCH 4/4] Fix gurobi version in action --- .github/workflows/check_output.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_output.yml b/.github/workflows/check_output.yml index 701371a..78b23fe 100644 --- a/.github/workflows/check_output.yml +++ b/.github/workflows/check_output.yml @@ -31,7 +31,7 @@ jobs: python -m pip install pypsa==0.31.1 python -m pip install pandas python -m pip install openpyxl - python -m pip install gurobipy + python -m pip install gurobipy==10.0.1 - shell: bash id: write-license