From b7750d21eaa58fd1f03af8b51ce39dd745290f71 Mon Sep 17 00:00:00 2001
From: Fabian <fab.hof@gmx.de>
Date: Wed, 31 Jan 2024 09:44:13 +0100
Subject: [PATCH] CI: use scip and highs as solvers for clustering and solving,
 instead of ipopt and glpk

---
 .github/workflows/ci.yaml           | 10 ----------
 config/test/config.electricity.yaml |  4 ++--
 config/test/config.myopic.yaml      |  4 ++--
 config/test/config.overnight.yaml   |  4 ++--
 config/test/config.perfect.yaml     |  4 ++--
 doc/release_notes.rst               |  5 +++++
 envs/environment.yaml               |  1 +
 7 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c0fb745d..cf52172f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -46,16 +46,6 @@ jobs:
       run: |
         echo -ne "url: ${CDSAPI_URL}\nkey: ${CDSAPI_TOKEN}\n" > ~/.cdsapirc
 
-    - name: Add solver to environment
-      run: |
-        echo -e "- glpk\n- ipopt<3.13.3" >> envs/environment.yaml
-      if: ${{ matrix.os }} == 'windows-latest'
-
-    - name: Add solver to environment
-      run: |
-        echo -e "- glpk\n- ipopt" >> envs/environment.yaml
-      if: ${{ matrix.os }} != 'windows-latest'
-
     - name: Setup micromamba
       uses: mamba-org/setup-micromamba@v1
       with:
diff --git a/config/test/config.electricity.yaml b/config/test/config.electricity.yaml
index b750bf62..ef9bfdc0 100644
--- a/config/test/config.electricity.yaml
+++ b/config/test/config.electricity.yaml
@@ -69,8 +69,8 @@ lines:
 
 solving:
   solver:
-    name: glpk
-    options: "glpk-default"
+    name: highs
+    options: "highs-default"
 
 
 plotting:
diff --git a/config/test/config.myopic.yaml b/config/test/config.myopic.yaml
index 2dab7b04..1da51b36 100644
--- a/config/test/config.myopic.yaml
+++ b/config/test/config.myopic.yaml
@@ -73,8 +73,8 @@ industry:
 
 solving:
   solver:
-    name: glpk
-    options: glpk-default
+    name: highs
+    options: highs-default
   mem: 4000
 
 plotting:
diff --git a/config/test/config.overnight.yaml b/config/test/config.overnight.yaml
index 6d1900cf..dffdab5a 100644
--- a/config/test/config.overnight.yaml
+++ b/config/test/config.overnight.yaml
@@ -65,8 +65,8 @@ sector:
 
 solving:
   solver:
-    name: glpk
-    options: glpk-default
+    name: highs
+    options: highs-default
   mem: 4000
 
 plotting:
diff --git a/config/test/config.perfect.yaml b/config/test/config.perfect.yaml
index f20a2c9f..8a5a9cce 100644
--- a/config/test/config.perfect.yaml
+++ b/config/test/config.perfect.yaml
@@ -75,8 +75,8 @@ industry:
 
 solving:
   solver:
-    name: glpk
-    options: glpk-default
+    name: highs
+    options: highs-default
   mem: 4000
 
 plotting:
diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index c20f1ebe..55e0ad97 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -62,6 +62,11 @@ Upcoming Release
 
 * To determine the optimal topology to meet the number of clusters, the workflow used pyomo in combination with ``ipopt`` or ``gurobi``. This dependency has been replaced by using ``linopy`` in combination with ``scipopt`` or ``gurobi``. The environment file has been updated accordingly.
 
+* The ``highs`` solver was added to the default environment file.
+
+* The default solver for testing the workflow in the CI has been changed from ``glpk`` to ``highs``.
+
+
 
 PyPSA-Eur 0.9.0 (5th January 2024)
 ==================================
diff --git a/envs/environment.yaml b/envs/environment.yaml
index d92eb696..235d7729 100644
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@@ -59,3 +59,4 @@ dependencies:
 
 - pip:
   - tsam>=2.3.1
+  - highspy