From b5b565adc037072f1260d379db157ddf9267e65a Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Tue, 2 Dec 2025 15:35:14 -0500 Subject: [PATCH 1/3] Fix pytest command path in CI workflow --- .github/workflows/ci-cvxpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cvxpy.yml b/.github/workflows/ci-cvxpy.yml index 742e42a..15208d8 100644 --- a/.github/workflows/ci-cvxpy.yml +++ b/.github/workflows/ci-cvxpy.yml @@ -65,4 +65,4 @@ jobs: - name: Test CVXPY run: | python3 -m pip install --break-system-packages pytest hypothesis ${{ matrix.numpy }} - (cd cvxpy/cvxpy/tests && python3 -m pytest -v .) + python3 -m pytest -v cvxpy/cvxpy/tests/ From eb06e44b6266e7e447dfb5b54f0fc599df7e9a1d Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Tue, 2 Dec 2025 15:52:19 -0500 Subject: [PATCH 2/3] Update ci-cvxpy.yml --- .github/workflows/ci-cvxpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cvxpy.yml b/.github/workflows/ci-cvxpy.yml index 15208d8..c321c5c 100644 --- a/.github/workflows/ci-cvxpy.yml +++ b/.github/workflows/ci-cvxpy.yml @@ -65,4 +65,4 @@ jobs: - name: Test CVXPY run: | python3 -m pip install --break-system-packages pytest hypothesis ${{ matrix.numpy }} - python3 -m pytest -v cvxpy/cvxpy/tests/ + python -m pytest --pyargs cvxpy.tests From 06c0a754e9c4fdb64266d80d7609f7ff0c8b6460 Mon Sep 17 00:00:00 2001 From: Ted Ralphs Date: Tue, 2 Dec 2025 16:25:31 -0500 Subject: [PATCH 3/3] Change numpy version in CI workflow Updated numpy version in CI workflow to comply with cvxpy requirements. --- .github/workflows/ci-cvxpy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cvxpy.yml b/.github/workflows/ci-cvxpy.yml index c321c5c..c4a6d4f 100644 --- a/.github/workflows/ci-cvxpy.yml +++ b/.github/workflows/ci-cvxpy.yml @@ -17,7 +17,7 @@ jobs: fail-fast: false matrix: os: [macos-latest] # Add ubuntu-latest when cvxpy pytest issue is solved - numpy: ['numpy==1.26.0', numpy] + numpy: [numpy] # We used to also test version 1.26.0, but now cvxpy requires numpy 2 runs-on: ${{ matrix.os }}