diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 18a6cf9..6b9c081 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,10 @@ Next Release ------------ +1.6.1 +----- +* fix the Gurobi version check to allow 10.0 + 1.6.0 ----- * fixes problem scaling for GLPK diff --git a/setup.cfg b/setup.cfg index af3a6c1..23bf0c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,11 +15,11 @@ classifiers = License :: OSI Approved :: Apache Software License Natural Language :: English Operating System :: OS Independent - Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3.5 - Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.11 Topic :: Scientific/Engineering :: Mathematics license = Apache-2.0 description = Formulate optimization problems using sympy expressions and solve them using interfaces to third-party optimization software (e.g. GLPK). @@ -35,7 +35,7 @@ keywords = zip_safe = True install_requires = six >=1.9 - swiglpk >=1.4.3 + swiglpk >=5.0.8 sympy >=1.0 python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.* tests_require = diff --git a/src/optlang/gurobi_interface.py b/src/optlang/gurobi_interface.py index e182be3..28aa782 100644 --- a/src/optlang/gurobi_interface.py +++ b/src/optlang/gurobi_interface.py @@ -36,7 +36,7 @@ try: version = gurobipy.gurobi.version() - if not (version[0] >= 9 and version[1] >= 5): + if version[:2] < (9, 5): raise RuntimeError() except Exception: raise RuntimeError(