Format and run CI

openscm · Jul 17, 2021 · 141cbcb · 141cbcb
1 parent 31246dd
commit 141cbcb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/ci-cd-workflow.yml b/.github/workflows/ci-cd-workflow.yml
@@ -1,5 +1,11 @@
 name: pymagicc CI-CD
-on: push
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - 'v*'
+  pull_request:
 
 jobs:
   linting-and-docs:

diff --git a/pymagicc/io/scen.py b/pymagicc/io/scen.py
@@ -182,7 +182,9 @@ def read_data_block(self):
             region = convert_magicc_to_openscm_regions(self._stream.readline().strip())
 
             try:
-                variables = self._read_data_header_line(self._stream, ["Years", "Year", "YEARS", "YEAR"])
+                variables = self._read_data_header_line(
+                    self._stream, ["Years", "Year", "YEARS", "YEAR"]
+                )
             except IndexError:  # tried to get variables from empty string
                 break
             except AssertionError:  # tried to get variables from a notes line

diff --git a/tests/test_io.py b/tests/test_io.py
@@ -848,6 +848,7 @@ def test_load_scen():
         todo="SET",
     )
 
+
 def test_load_remind_scen():
     mdata = MAGICCData(join(TEST_DATA_DIR, "REMIND_testOneRegi.SCEN"))
 
@@ -856,7 +857,7 @@ def test_load_remind_scen():
     assert_mdata_value(
         mdata,
         6.735,
-        variable='Emissions|CO2|MAGICC Fossil and Industrial',
+        variable="Emissions|CO2|MAGICC Fossil and Industrial",
         region="World",
         year=2000,
         unit="Gt C / yr",
@@ -865,7 +866,7 @@ def test_load_remind_scen():
     assert_mdata_value(
         mdata,
         1.4845,
-        variable='Emissions|CO2|MAGICC Fossil and Industrial',
+        variable="Emissions|CO2|MAGICC Fossil and Industrial",
         region="World",
         year=2500,
         unit="Gt C / yr",
@@ -874,7 +875,7 @@ def test_load_remind_scen():
     assert_mdata_value(
         mdata,
         5.5382,
-        variable='Emissions|SF6',
+        variable="Emissions|SF6",
         region="World",
         year=2500,
         unit="kt SF6 / yr",
@@ -883,7 +884,7 @@ def test_load_remind_scen():
     assert_mdata_value(
         mdata,
         9.4971,
-        variable='Emissions|SF6',
+        variable="Emissions|SF6",
         region="World",
         year=2100,
         unit="kt SF6 / yr",
@@ -892,7 +893,7 @@ def test_load_remind_scen():
     assert_mdata_value(
         mdata,
         0.000,
-        variable='Emissions|SF6',
+        variable="Emissions|SF6",
         region="World",
         year=2150,
         unit="kt SF6 / yr",
@@ -901,15 +902,14 @@ def test_load_remind_scen():
     assert_mdata_value(
         mdata,
         0.0138,
-        variable='Emissions|OC',
+        variable="Emissions|OC",
         region="World|Bunkers",
         year=2150,
         unit="Mt OC / yr",
         todo="SET",
     )
 
 
-
 def test_load_scen_specify_metadata():
     tmodel = "MESSAGE"
     tscenario = "RCP45"