Merge branch 'master' into pre-commit-ci-update-config

Author: FabianHofmann

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")