Merge branch 'dev' into feature/report_for_linux

rl-institut · Aug 31, 2023 · e109ed4 · e109ed4
2 parents 2aa2bea + 3af179c
commit e109ed4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.7, 3.8 ]
+        python-version: [ 3.8 ]
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:

diff --git a/oemof_b3/config/labels/de.yml b/oemof_b3/config/labels/de.yml
@@ -1,7 +1,10 @@
 # oil: Öl  Raises error as "oil" is in "boiler" -> duplicate mappings
+oil: Öl
 oil-gt: Oil GT
-biomass-gt: Biomass GT
-biomass-st: Biomass DT
+biomass: Biomasse
+biomass-gt: Biomasse GT
+biomass-st: Biomasse DT
+ch4: CH4
 ch4-boiler: CH4 Boiler
 ch4-bpchp: CH4 KWK (Gegendruck)
 ch4-demand: CH4 Bedarf

diff --git a/oemof_b3/config/labels/en.yml b/oemof_b3/config/labels/en.yml
@@ -2,6 +2,7 @@
 biomass-gt: Biomass GT
 biomass-st: Biomass ST
 biomass: Biomass
+ch4: CH4
 ch4-boiler: CH4 boiler
 ch4-bpchp: CH4 backpressure CHP
 ch4-demand: CH4 demand
@@ -42,3 +43,4 @@ heat_decentral-storage: Heat dec. storage
 hydro-ror: Hydro ROR
 solar-pv: PV
 wind-onshore: Wind on
+oil: Oil