Skip to content

Commit

Permalink
Merge branch 'main' into update-docs-theme
Browse files Browse the repository at this point in the history
  • Loading branch information
simonbowly committed May 20, 2024
2 parents c68d0a0 + 75e8c19 commit 4d0e76d
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 24 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/code-quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.11"
- name: Install tooling
run: |
python -m pip install --upgrade pip
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/doc-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
python: ["3.11"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install tooling
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/doc-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python: ["3.8", "3.11"]
gurobipy: ["10.0.3", "11.0.0"]
scipy: ["1.8.1", "1.11.4"]
python: ["3.8", "3.12"]
gurobipy: ["10.0.3", "11.0.2"]
scipy: ["1.8.1", "1.13.0"]
exclude:
- python: "3.11"
- python: "3.12"
gurobipy: "10.0.3"
- python: "3.8"
scipy: "1.11.4"
- python: "3.11"
scipy: "1.13.0"
- python: "3.12"
scipy: "1.8.1"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install tooling
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
publish-pypi:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.8"
python-version: "3.11"
- name: Install build tools
run: |
python -m pip install --upgrade pip
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ jobs:
strategy:
matrix:
python: ["3.8", "3.12"]
gurobipy: ["10.0.3", "11.0.0"]
scipy: ["1.8.1", "1.11.4"]
gurobipy: ["10.0.3", "11.0.2"]
scipy: ["1.8.1", "1.13.0"]
exclude:
- python: "3.12"
gurobipy: "10.0.3"
- python: "3.8"
scipy: "1.11.4"
scipy: "1.13.0"
- python: "3.12"
scipy: "1.8.1"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install tooling
Expand Down
9 changes: 6 additions & 3 deletions .github/workflows/wheel-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python: ["3.8", "3.9", "3.10", "3.11"]
python: ["3.8", "3.9", "3.10", "3.11", "3.12"]
exclude:
- os: macos-latest
- python: "3.8"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}
- name: Install build tools
Expand Down
1 change: 1 addition & 0 deletions tests/opf/test_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ def test_ac(self):
self.assert_approx_equal(solution["gen"][1]["Qg"], 0.031844, tol=1e-1)
self.assert_approx_equal(solution["branch"][0]["Qf"], 12.9656, tol=1e-1)

@unittest.skip("shaky")
def test_ac_branchswitching(self):
solution = solve_opf(
self.case,
Expand Down

0 comments on commit 4d0e76d

Please sign in to comment.