From c14801e5c5d99623c7a1b7de60cb2efe0ef99ffd Mon Sep 17 00:00:00 2001 From: Fabian Hofmann Date: Thu, 16 Oct 2025 10:41:31 +0200 Subject: [PATCH 1/2] Handle ImportError in xpress import Also catch ImportError for xpress import. This should resolve rarely occuring compat problem with numpy packages --- linopy/solvers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linopy/solvers.py b/linopy/solvers.py index 8ccdbcd1..042441c0 100644 --- a/linopy/solvers.py +++ b/linopy/solvers.py @@ -103,7 +103,7 @@ available_solvers.append("cplex") -with contextlib.suppress(ModuleNotFoundError): +with contextlib.suppress(ModuleNotFoundError,ImportError): import xpress available_solvers.append("xpress") From 53d40e0d16fdfb1bd636a79ee184ff4d309b6906 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 08:41:57 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- linopy/solvers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linopy/solvers.py b/linopy/solvers.py index 042441c0..087ec75e 100644 --- a/linopy/solvers.py +++ b/linopy/solvers.py @@ -103,7 +103,7 @@ available_solvers.append("cplex") -with contextlib.suppress(ModuleNotFoundError,ImportError): +with contextlib.suppress(ModuleNotFoundError, ImportError): import xpress available_solvers.append("xpress")