Merge branch 'Demand_Update_Modeling_' of https://github.com/Margheri…

…ta-Capitani/pypsa-distribution into Demand_Update_Modeling_
pypsa-meets-earth · Nov 5, 2024 · 82abdd9 · 82abdd9
2 parents 86e5b7d + 3b008c4
commit 82abdd9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/ci-linux.yaml b/.github/workflows/ci-linux.yaml
@@ -56,12 +56,12 @@ jobs:
       id: cache
       with:
         path: ${{ matrix.prefix }}
-        key: ${{ matrix.label }}-conda-${{ hashFiles('pypsa-earth/envs/environment.yaml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
+        key: ${{ matrix.label }}-conda-${{ hashFiles('envs/environment.yaml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
 
     - name: Update environment due to outdated or unavailable cache
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        mamba env update -n pypsa-earth -f pypsa-earth/envs/environment.yaml
+        mamba env update -n pypsa-earth -f envs/environment.yaml
         conda activate pypsa-earth
         pip install rampdemand
 

diff --git a/envs/environment.yaml b/envs/environment.yaml
@@ -31,7 +31,7 @@ dependencies:
 - numpy
 - pandas
 - geopandas>=0.11.0, <=0.14.3
-- fiona<1.10.0 
+- fiona<1.10.0
 - xarray>=2023.11.0, <2023.12.0
 - netcdf4
 - networkx
@@ -88,4 +88,4 @@ dependencies:
   - git+https://github.com/FRESNA/vresutils@master  # until new pip release > 0.3.1 (strictly)
   - tsam>=1.1.0
   - chaospy  # lastest version only available on pip
-  - fake_useragent
+  - fake_useragent
diff --git a/test/config.distribution.test.yaml b/test/config.distribution.test.yaml
@@ -69,7 +69,7 @@ electricity:
     H2: 168
 
   extendable_carriers:
-    Generator: [solar, onwind,diesel]
+    Generator: [solar, onwind, diesel]
     StorageUnit: ["lithium", "lead acid"]
   conventional_carriers: [diesel]