Merge branch 'master' into feature/add-const-expression

Author: FabianHofmann

.github/workflows/codeql.yml

@@ -59,7 +59,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         build-mode: ${{ matrix.build-mode }}
@@ -87,6 +87,6 @@ jobs:
         exit 1
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         category: "/language:${{matrix.language}}"

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
     permissions:
       id-token: write
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v6
         with:
           name: Packages
           path: dist

.github/workflows/test-models.yml

@@ -101,7 +101,7 @@ jobs:
 
       - name: Upload artifacts
         if: env.pinned == 'false'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: results-pypsa-eur-${{ matrix.version }}
           path: |

.github/workflows/test.yml

@@ -74,7 +74,7 @@ jobs:
         choco install glpk
 
     - name: Download package
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: Packages
         path: dist
@@ -112,7 +112,7 @@ jobs:
         python-version: 3.12
 
     - name: Download package
-      uses: actions/download-artifact@v5
+      uses: actions/download-artifact@v6
       with:
         name: Packages
         path: dist

doc/release_notes.rst

@@ -3,6 +3,7 @@ Release Notes
 
 .. Upcoming Version
 * Add convenience function to create LinearExpression from constant
+* Fix compatibility for xpress versions below 9.6 (regression)
 
 Version 0.5.8
 --------------

linopy/solvers.py

@@ -108,6 +108,17 @@
 
     available_solvers.append("xpress")
 
+    # xpress.Namespaces was added in xpress 9.6
+    try:
+        from xpress import Namespaces as xpress_Namespaces
+    except ImportError:
+
+        class xpress_Namespaces:  # type: ignore[no-redef]
+            ROW = 1
+            COLUMN = 2
+            SET = 3
+
+
 with contextlib.suppress(ModuleNotFoundError):
     import mosek
 
@@ -1605,13 +1616,13 @@ def solve_problem_from_file(
         def get_solver_solution() -> Solution:
             objective = m.getObjVal()
 
-            var = m.getnamelist(xpress.Namespaces.COLUMN, 0, m.attributes.cols - 1)
+            var = m.getnamelist(xpress_Namespaces.COLUMN, 0, m.attributes.cols - 1)
             sol = pd.Series(m.getSolution(), index=var, dtype=float)
 
             try:
                 _dual = m.getDual()
                 constraints = m.getnamelist(
-                    xpress.Namespaces.ROW, 0, m.attributes.rows - 1
+                    xpress_Namespaces.ROW, 0, m.attributes.rows - 1
                 )
                 dual = pd.Series(_dual, index=constraints, dtype=float)
             except (xpress.SolverError, xpress.ModelError, SystemError):