From e65ce91a73df87e8ee064ad78df33909ee797fa2 Mon Sep 17 00:00:00 2001
From: Lukas Trippe <lkstrp@pm.me>
Date: Tue, 24 Sep 2024 10:26:03 +0200
Subject: [PATCH] fix: failing macos pypsa installation (#1325)

---
 .github/workflows/test.yaml | 11 +----------
 envs/environment.yaml       |  3 ++-
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 5ac25db8..32340563 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -76,18 +76,9 @@ jobs:
       id: cache-env
 
     - name: Update environment
-      if: steps.cache-env.outputs.cache-hit != 'true' && matrix.os != 'macos'
+      if: steps.cache-env.outputs.cache-hit != 'true'
       run: conda env update -n pypsa-eur -f envs/environment.yaml
 
-    # Temporary fix for MacOS, since highspy with pypsa can not be resolved
-    - name: Update environment (macos specific)
-      if: steps.cache-env.outputs.cache-hit != 'true' && matrix.os == 'macos'
-      run: |
-        sed -i '' '/- pypsa/d' envs/environment.yaml # Remove pypsa from environment list
-        conda env update -n pypsa-eur -f envs/environment.yaml
-        pip install highspy
-        conda install -c conda-forge pypsa
-
     - name: Install inhouse packages from master
       if: matrix.inhouse == 'dev-inhouse-deps'
       run: |
diff --git a/envs/environment.yaml b/envs/environment.yaml
index 9fd7aa00..8ee9806a 100644
--- a/envs/environment.yaml
+++ b/envs/environment.yaml
@@ -10,8 +10,10 @@ dependencies:
 - python>=3.8
 - pip
 
+- pypsa>=0.30.2
 - atlite>=0.2.9
 - linopy
+
 - dask
 
 # Dependencies of the workflow itself
@@ -62,4 +64,3 @@ dependencies:
   - snakemake-executor-plugin-slurm
   - snakemake-executor-plugin-cluster-generic
   - highspy
-  - pypsa>=0.30.2