Merge pull request #10 from dvuckovic/develop

Temporarily pin the Python version until new NumPy wheels are available
ecmwf · Nov 15, 2021 · 170a19b · 170a19b
2 parents 922387b + 5e2c2f4
commit 170a19b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 25 deletions.
diff --git a/.github/workflows/python-publish.yml b/.github/workflows/python-publish.yml
@@ -13,6 +13,9 @@ on:
   release:
     types: [created]
 
+env:
+  PYTHON_VERSION: 3.9
+
 jobs:
 
   quality:
@@ -39,7 +42,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.x'
+        python-version: ${{ env.PYTHON_VERSION }}
     - run: python setup.py develop
     - run: pip install -r tests/requirements.txt
     - name: Print environment
@@ -57,11 +60,11 @@ jobs:
     needs: tests
     steps:
     - uses: actions/checkout@v2
-    
+
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.x'
+        python-version: ${{ env.PYTHON_VERSION }}
 
     - name: Install dependencies
       run: |
@@ -81,6 +84,3 @@ jobs:
       run: |
         python setup.py sdist
         twine upload dist/*
-
-  
-
diff --git a/.github/workflows/test-coverage.yml b/.github/workflows/test-coverage.yml
@@ -10,6 +10,9 @@ on:
   push:
     branches: [ develop ]
 
+env:
+  PYTHON_VERSION: 3.9
+
 jobs:
 
   quality:
@@ -36,7 +39,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.x'
+        python-version: ${{ env.PYTHON_VERSION }}
     - run: python setup.py develop
     - run: pip install -r tests/requirements.txt
     - name: Print environment
@@ -53,5 +56,3 @@ jobs:
       uses: codecov/codecov-action@v1
       with:
         fail_ci_if_error: true
-
-
diff --git a/examples/thermofeel_calculations.py b/examples/thermofeel_calculations.py
@@ -25,7 +25,7 @@ def mydebug(name, values):
 
 def decode_grib(fpath):
 
-    #print(f"decoding file {fpath}")
+    # print(f"decoding file {fpath}")
 
     prev_step = None
     prev_number = None
@@ -81,7 +81,7 @@ def decode_grib(fpath):
             prev_number = number
             prev_step = step
 
-            #print(f"message {msgcount} mars metadata: {md}")
+            # print(f"message {msgcount} mars metadata: {md}")
 
             # aggregate messages on step, number, assuming they are contiguous
 
@@ -166,22 +166,25 @@ def calc_apparent_temp(messages):
 
     return at
 
+
 def calc_humidex(messages):
     t2m = messages["2t"]["values"]
     td = messages["2d"]["values"]
 
-    humidex = thermofeel.calculate_humidex(t2m=t2m,td=td)
+    humidex = thermofeel.calculate_humidex(t2m=t2m, td=td)
 
     return humidex
 
+
 def calc_rela_humid_perc(messages):
     t2m = messages["2t"]["values"]
     td = messages["2d"]["values"]
 
-    rhp = thermofeel.calculate_relative_humidity_percent(t2m=t2m,td=td)
+    rhp = thermofeel.calculate_relative_humidity_percent(t2m=t2m, td=td)
 
     return rhp
 
+
 def calc_mrt(messages, cossza):
 
     step = messages["2t"]["step"]
@@ -275,40 +278,40 @@ def main():
 
         check_messages(msgs)
 
-        #print(f"loaded {len(msgs)} parameters: {list(msgs.keys())}")
+        # print(f"loaded {len(msgs)} parameters: {list(msgs.keys())}")
 
         msg = msgs["2t"]
 
-        dt = msg["base_datetime"]
+        # dt = msg["base_datetime"]
 
         ftime = int(msg["time"] / 100)
 
         step_begin = ftime
         step_end = ftime + msg["step"]
 
-        #print(f"Date {dt} -- Time {ftime} -- Interval [{step_begin},{step_end}]")
+        # print(f"Date {dt} -- Time {ftime} -- Interval [{step_begin},{step_end}]")
 
         t2 = msgs["2t"]["values"]  # Kelvin
         mydebug("2t", t2)
 
-        #humidex = calc_humidex(messages=msgs)
-        #apparenttemp = calc_apparent_temp(messages=msgs)
-        #rhp = calc_rela_humid_perc(messages=msgs)
+        # humidex = calc_humidex(messages=msgs)
+        # apparenttemp = calc_apparent_temp(messages=msgs)
+        # rhp = calc_rela_humid_perc(messages=msgs)
 
         cossza = calc_cossza_int(messages=msgs, begin=step_begin, end=step_end)
-        #mydebug("cossza", cossza)
+        # mydebug("cossza", cossza)
 
         mrt = calc_mrt(messages=msgs, cossza=cossza)
-        #mydebug("mrt", mrt)
+        # mydebug("mrt", mrt)
 
         utci = calc_utci(messages=msgs, mrt=mrt)
         utci = thermofeel.celsius_to_kelvin(utci)
-        #mydebug("utci", utci)
+        # mydebug("utci", utci)
 
         # output_grib(output, msg, "167", t2)
-        #output_grib(output,msg,"157",rhp)
-        #output_grib(output,msg,"260255",apparenttemp)
-        #output_grib(output,msg,"260004",humidex) #heat index parameter ID
+        # output_grib(output,msg,"157",rhp)
+        # output_grib(output,msg,"260255",apparenttemp)
+        # output_grib(output,msg,"260004",humidex) #heat index parameter ID
         output_grib(output, msg, "214001", cossza)
         output_grib(output, msg, "261001", utci, float(-9999))
         output_grib(output, msg, "261002", mrt)