Merge branch 'main' into isccpg_ng

.git_archival.txt

@@ -1 +1,4 @@
-ref-names: $Format:%D$
+node: $Format:%H$
+node-date: $Format:%cI$
+describe-name: $Format:%(describe:tags=true)$
+ref-names: $Format:%D$

.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ jobs:
       fail-fast: true
       matrix:
         os: ["ubuntu-latest", "macos-latest"]
-        python-version: ["3.7", "3.8", "3.9"]
+        python-version: ["3.8", "3.9", "3.10"]
         experimental: [false]
         include:
           - python-version: "3.9"

CHANGELOG.md

@@ -1,3 +1,23 @@
+## Version <v.0.2.32> (2023/02/15)
+
+
+### Pull Requests Merged
+
+* [PR 75](https://github.com/foua-pps/level1c4pps/pull/75) - Pyspectral 1.7.2 and satpy <= 0.37 for gac data, by [@ninahakansson](https://github.com/ninahakansson)
+
+In this release 1 pull request was closed.
+
+## Version <v.0.2.31> (2023/01/19)
+
+
+### Pull Requests Merged
+
+* [PR 73](https://github.com/foua-pps/level1c4pps/pull/73) - Fixing channel unit, by [@ninahakansson](https://github.com/ninahakansson)
+* [PR 72](https://github.com/foua-pps/level1c4pps/pull/72) - Read also channel 7.3µm MERSI2, by [@ninahakansson](https://github.com/ninahakansson)
+* [PR 71](https://github.com/foua-pps/level1c4pps/pull/71) - Add clipping for SEVIRI calibration coefficients, by [@sfinkens](https://github.com/sfinkens)
+
+In this release 3 pull requests were closed.
+
 ## Version <v.0.2.30> (2022/04/29)
 
 

RELEASING.md

@@ -3,7 +3,7 @@
 prerequisites: `pip install setuptools twine`
 
 
-1. checkout master
+1. checkout main
 2. pull from repo
 3. run the unittests
 4. run `loghub` and update the `CHANGELOG.md` file:
@@ -17,6 +17,11 @@ Example:
 loghub foua-pps/level1c4pps -st v0.2.28 -plg bug "Bugs fixed" -plg enhancement "Features added" -plg documentation "Documentation changes"
 ```
 
+Or only:
+```
+loghub foua-pps/level1c4pps  -st v0.2.31 
+```
+
 The  "--token <personal access token (see https://github.com/settings/tokens)>" somtimes can be excluded.
 
 Paste CHANGELOG.temp to CHANGELOG.md and update RELEASE-VERSION to the version that will be released.
@@ -32,7 +37,7 @@ git tag -a v0.2.29 -m "Version 0.2.29"
 See [semver.org](http://semver.org/) on how to write a version number.
 
 
-6. push changes to github `git push name-of-foua-pps-repo master --follow-tags`
+6. push changes to github `git push name-of-foua-pps-repo main --follow-tags`
 
 7. Verify the Github actions unit tests passed
 

continuous_integration/environment.yaml

@@ -23,7 +23,7 @@ dependencies:
   - mock
   - numpy
   - xarray
-  - satpy
+  - satpy<0.38|>0.41.1
   - pyspectral
   - h5netcdf
   - pyorbital

level1c4pps/eumgacfdr2pps_lib.py

@@ -60,7 +60,8 @@
               'sensor_azimuth_angle',
               'sun_sensor_azimuth_difference_angle']
 
-REFL_BANDS = ['reflectance_channel_1', 'reflectance_channel_2', 'reflectance_channel_3']
+REFL_BANDS = ['reflectance_channel_1', 'reflectance_channel_2', 'reflectance_channel_3',
+              'reflectance_channel_3a']
 
 PPS_TAGNAMES = {"reflectance_channel_1": "ch_r06",
                 "reflectance_channel_2": "ch_r09",

level1c4pps/tests/test_seviri2pps.py

@@ -81,17 +81,26 @@ def test_load_and_calibrate(self, mocked_scene):
         )
 
         # Compare results and expectations
-        vis006_exp = xr.DataArray(
+        vis006_exp_pyspectral_1_7_1 = xr.DataArray(
             [[1.07025268, 2.14050537],
              [3.21075805, 4.28101074]],
             dims=('y', 'x')
         )
+        vis006_exp = xr.DataArray(
+            [[1.034205, 2.06841],
+             [3.102615, 4.13682]],
+            dims=('y', 'x')
+        )
         ir_108_exp = xr.DataArray(
             [[5, 6],
              [7, 8]],
             dims=('y', 'x')
         )
-        xr.testing.assert_allclose(res['VIS006'], vis006_exp)
+        if res['VIS006'][0, 0] > 1.04:
+            # pyspectral 1.7.1 and older
+            xr.testing.assert_allclose(res['VIS006'], vis006_exp_pyspectral_1_7_1)
+        else:
+            xr.testing.assert_allclose(res['VIS006'], vis006_exp)
         xr.testing.assert_equal(res['IR_108'], ir_108_exp)
         self.assertFalse(
             res['VIS006'].attrs['sun_earth_distance_correction_applied'],

setup.cfg

@@ -1,7 +1,6 @@
 [options]
 setup_requires =
     setuptools_scm
-    setuptools_scm_git_archive
 
 [bdist_rpm]
 provides=level1c4pps

setup.py

@@ -35,7 +35,7 @@
 except ImportError:
     pass
 
-requires = ['satpy >= 0.19', 'pyorbital', 'trollsift', 'pyspectral', 'h5netcdf'],
+requires = ['satpy!=0.38.*,!=0.39.*,!=0.40.*,!=0.41.*', 'pyorbital', 'trollsift', 'pyspectral', 'h5netcdf'],
 
 NAME = "level1c4pps"
 README = open('README.md', 'r').read()