From 93202bfe70f3670539470fb41b73217d15e4eff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filipe=20Brand=C3=A3o?= Date: Mon, 26 Feb 2024 19:17:00 +0000 Subject: [PATCH] nlwpy: run tests using minos --- nl-writer2/nlwpy/test/test_solve.py | 6 ++---- nl-writer2/pyproject.toml | 9 +++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/nl-writer2/nlwpy/test/test_solve.py b/nl-writer2/nlwpy/test/test_solve.py index 672ea184c..7b4afca49 100644 --- a/nl-writer2/nlwpy/test/test_solve.py +++ b/nl-writer2/nlwpy/test/test_solve.py @@ -159,10 +159,8 @@ def solve_and_check(solver, sopts, binary, stub): def find_solver(): lst = modules.installed() - if "gurobi" in lst: - return modules.find("gurobi") - else: - return modules.find("minos") + assert "minos" in lst + return modules.find("minos") def test_binary_nl(): diff --git a/nl-writer2/pyproject.toml b/nl-writer2/pyproject.toml index e50cec73a..d71a03760 100644 --- a/nl-writer2/pyproject.toml +++ b/nl-writer2/pyproject.toml @@ -11,11 +11,12 @@ test-requires = [ "--index-url https://pypi.ampl.com", "--extra-index-url https://pypi.org/simple", "ampl_module_base", - "ampl_module_gurobi", - "ampl_module_highs", "ampl_module_minos", - "amplpy", "pandas", - "numpy", scipy", "pytest"] + "amplpy", + "pandas", + "numpy", + "scipy", + "pytest"] test-command = "pytest --pyargs nlwpy.test" [tool.cibuildwheel.macos]