Skip to content

Commit

Permalink
Enable previously skipped tests
Browse files Browse the repository at this point in the history
  • Loading branch information
usamamuneeb committed Apr 4, 2023
1 parent 758faa7 commit b160dd8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
4 changes: 2 additions & 2 deletions continuous_integration/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ fi


if [[ "$PYTHON_VERSION" == "3.11" ]]; then
python -m pip install gurobipy clarabel osqp
python -m pip install gurobipy clarabel osqp sdpa-python
# Python 3.8 on Windows will uninstall NumPy 1.16 and install NumPy 1.24 without the exception.
elif [[ "$RUNNER_OS" == "Windows" ]] && [[ "$PYTHON_VERSION" == "3.8" ]]; then
python -m pip install gurobipy clarabel osqp
else
python -m pip install "ortools>=9.3,<9.5" coptpy cplex sdpa-python diffcp gurobipy xpress clarabel sdpa-python
python -m pip install "ortools>=9.3,<9.5" coptpy cplex sdpa-python diffcp gurobipy xpress clarabel
fi

# cylp has wheels for all versions 3.7 - 3.10, except for 3.7 on Windows
Expand Down
3 changes: 1 addition & 2 deletions cvxpy/tests/test_conic_solvers.py
Original file line number Diff line number Diff line change
Expand Up @@ -769,11 +769,10 @@ def test_sdpa_lp_3(self) -> None:
def test_sdpa_lp_4(self) -> None:
StandardTestLPs.test_lp_4(solver='SDPA')

@unittest.skip('Known limitation of SDPA for degenerate LPs.')
def test_sdpa_lp_5(self) -> None:
# this also tests the ability to pass solver options
StandardTestLPs.test_lp_5(solver='SDPA',
gammaStar=0.86, epsilonDash=8.0E-6, betaStar=0.18, betaBar=0.15)
betaBar=0.1, gammaStar=0.8, epsilonDash=8.0E-6)

def test_sdpa_sdp_1(self) -> None:
# minimization
Expand Down
2 changes: 1 addition & 1 deletion cvxpy/tests/test_problem.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ def test_verbose(self) -> None:
# Don't test GLPK because there's a race
# condition in setting CVXOPT solver options.
if solver in [cp.GLPK, cp.GLPK_MI, cp.MOSEK, cp.CBC,
cp.SCIPY, cp.SDPA, cp.COPT]:
cp.SCIPY, cp.COPT]:
continue
sys.stdout = StringIO() # capture output

Expand Down

0 comments on commit b160dd8

Please sign in to comment.