Skip to content

Commit 72168f8

Browse files
authored
Merge branch 'master' into bugfix/fix-tz-aware-alignment
2 parents 3e85639 + 9ce2005 commit 72168f8

34 files changed

Lines changed: 2293 additions & 238 deletions

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
permissions:
3737
id-token: write
3838
steps:
39-
- uses: actions/download-artifact@v6
39+
- uses: actions/download-artifact@v7
4040
with:
4141
name: Packages
4242
path: dist

.github/workflows/test-models.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
echo -ne "url: ${CDSAPI_URL}\nkey: ${CDSAPI_TOKEN}\n" > ~/.cdsapirc
6060
echo "week=$(date +'%Y%U')" >> $GITHUB_ENV # data and cutouts
6161
62-
- uses: actions/cache@v4
62+
- uses: actions/cache@v5
6363
if: env.pinned == 'false'
6464
with:
6565
path: |
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Cache Conda env
7676
if: env.pinned == 'false'
77-
uses: actions/cache@v4
77+
uses: actions/cache@v5
7878
with:
7979
path: ${{ env.CONDA }}/envs
8080
key: conda-pypsa-eur-${{ env.week }}-${{ hashFiles('envs/linux-64.lock.yaml') }}
@@ -101,7 +101,7 @@ jobs:
101101
102102
- name: Upload artifacts
103103
if: env.pinned == 'false'
104-
uses: actions/upload-artifact@v5
104+
uses: actions/upload-artifact@v6
105105
with:
106106
name: results-pypsa-eur-${{ matrix.version }}
107107
path: |

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
choco install glpk
7575
7676
- name: Download package
77-
uses: actions/download-artifact@v6
77+
uses: actions/download-artifact@v7
7878
with:
7979
name: Packages
8080
path: dist
@@ -112,7 +112,7 @@ jobs:
112112
python-version: 3.12
113113

114114
- name: Download package
115-
uses: actions/download-artifact@v6
115+
uses: actions/download-artifact@v7
116116
with:
117117
name: Packages
118118
path: dist

CLAUDE.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
66

77
### Running Tests
88
```bash
9-
# Run all tests
9+
# Run all tests (excluding GPU tests by default)
1010
pytest
1111

1212
# Run tests with coverage
@@ -17,8 +17,16 @@ pytest test/test_model.py
1717

1818
# Run a specific test function
1919
pytest test/test_model.py::test_model_creation
20+
21+
# Run GPU tests (requires GPU hardware and cuPDLPx installation)
22+
pytest --run-gpu
23+
24+
# Run only GPU tests
25+
pytest -m gpu --run-gpu
2026
```
2127

28+
**GPU Testing**: Tests that require GPU hardware (e.g., cuPDLPx solver) are automatically skipped by default since CI machines typically don't have GPUs. To run GPU tests locally, use the `--run-gpu` flag. The tests are automatically marked with `@pytest.mark.gpu` based on solver capabilities.
29+
2230
### Linting and Type Checking
2331
```bash
2432
# Run linter (ruff)

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ Fri 0 4
149149
* [Cplex](https://www.ibm.com/de-de/analytics/cplex-optimizer)
150150
* [MOSEK](https://www.mosek.com/)
151151
* [COPT](https://www.shanshu.ai/copt)
152+
* [cuPDLPx](https://github.com/MIT-Lu-Lab/cuPDLPx)
152153

153154
Note that these do have to be installed by the user separately.
154155

0 commit comments

Comments
 (0)