Skip to content

Commit ba5d62c

Browse files
authored
Merge pull request #135 from CURENT/develop
Prep v1.0.7
2 parents 3dbdbfe + 1d77f33 commit ba5d62c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+1081
-1661
lines changed

.github/workflows/codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: Try installing optional packages
3333
run: |
3434
# Try installing one of the optional packages
35-
pip install gurobipy || pip install coptpy || pip install xpress || pip install cplex || echo "All optional packages failed to install. Skipping."
35+
pip install PySCIPOpt || pip install xpress || pip install gurobipy || pip install cplex || echo "All optional packages failed to install. Skipping."
3636
3737
- shell: bash -el {0}
3838
name: Run pip check

.github/workflows/compatibility.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,12 @@ jobs:
4040
4141
- shell: bash -el {0}
4242
name: pytest
43+
run: |
44+
pytest
45+
continue-on-error: ${{ matrix.os == 'windows-latest' }}
46+
47+
- if: ${{ failure() && matrix.os == 'windows-latest' }}
48+
shell: bash -el {0}
49+
name: Retry pytest
4350
run: |
4451
pytest

.github/workflows/publish-pypi.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,38 @@ jobs:
1818
channels: conda-forge,defaults
1919
channel-priority: true
2020
activate-environment: anaconda-client-env
21+
2122
- shell: bash -el {0}
2223
name: Install dependencies
2324
run: |
2425
mamba install -y nbmake pytest-xdist line_profiler # add'l packages for notebook tests.
2526
mamba install --file requirements.txt --file requirements-dev.txt
2627
python -m pip install -e .
28+
2729
- shell: bash -el {0}
2830
name: Try installing optional packages
2931
run: |
3032
# Try installing one of the optional packages
31-
pip install gurobipy || pip install coptpy || pip install xpress || pip install cplex || echo "All optional packages failed to install. Skipping."
33+
pip install PySCIPOpt || pip install xpress || pip install gurobipy || pip install cplex || echo "All optional packages failed to install. Skipping."
34+
3235
- shell: bash -el {0}
3336
name: Run pip check
3437
run: |
3538
if ! pip check; then
3639
echo "pip check failed, but the job will continue."
3740
fi
41+
3842
- shell: bash -el {0}
3943
name: Lint with flake8
4044
if: github.event_name == 'pull_request'
4145
run: |
4246
flake8 .
47+
4348
- shell: bash -el {0}
4449
name: Test with pytest
4550
run: |
4651
pytest
52+
4753
- shell: bash -el {0}
4854
name: Test notebooks.
4955
run: |

ams/cases/5bus/pjm5bus_demo.xlsx

1.46 KB
Binary file not shown.

ams/cases/5bus/pjm5bus_ev.xlsx

19 KB
Binary file not shown.

ams/cases/5bus/pjm5bus_jumper.xlsx

-8.83 KB
Binary file not shown.

0 commit comments

Comments
 (0)