Merge branch 'master' into snyk-fix-e588cfcc27bcadbc2eabf996ef130c7b

.github/workflows/ci.yaml

@@ -43,7 +43,7 @@ jobs:
         with:
           miniforge-variant: Mambaforge
           miniforge-version: latest
-          python-version: "3.10"
+          python-version: "3.11"
           use-mamba: true
           environment-file: continuous_integration/environment.yaml
           activate-environment: test-environment
@@ -73,10 +73,10 @@ jobs:
         # XXX: We don't currently have OpenGL installation on other platforms
         #os: ["windows-latest", "ubuntu-latest", "macos-latest"]
         os: ["ubuntu-latest"]
-        python-version: ["3.8", "3.10"]
+        python-version: ["3.9", "3.11"]
         experimental: [false]
         include:
-          - python-version: "3.10"
+          - python-version: "3.11"
             os: "ubuntu-latest"
             experimental: true
 
@@ -128,7 +128,6 @@ jobs:
           --no-deps --upgrade \
           git+https://github.com/dask/dask \
           git+https://github.com/dask/distributed \
-          git+https://github.com/zarr-developers/zarr \
           git+https://github.com/Unidata/cftime \
           git+https://github.com/mapbox/rasterio \
           git+https://github.com/pydata/bottleneck \

.pre-commit-config.yaml

@@ -40,7 +40,7 @@ repos:
       - id: mypy
         additional_dependencies:
           - types-docutils
-          - types-pkg-resources
+          - types-setuptools
           - types-PyYAML
           - types-requests
           - types-python-dateutil

continuous_integration/environment.yaml

@@ -2,11 +2,13 @@ name: test-environment
 channels:
   - conda-forge
 dependencies:
+  # limiting python due to ecmwflibs
+  - python<=3.11
   - appdirs
   - defusedxml
   - Cython
   - imageio
-  - imageio-ffmpeg
+  - av
   - matplotlib
   - numba
   - numpy

continuous_integration/rtd_environment.yaml

@@ -2,6 +2,8 @@ name: test-environment
 channels:
   - conda-forge
 dependencies:
+  # limiting python due to ecmwflibs
+  - python<=3.11
   - appdirs
   - defusedxml
   - Cython

setup.py

@@ -202,6 +202,7 @@ def run(self):
         "donfig>=0.8.1",
         "h5py",
         "imageio",
+        "av",
         "matplotlib",
         "netCDF4",
         "numba",
@@ -226,7 +227,7 @@ def run(self):
         "cfgrib",
     ],
     tests_requires=["pytest", "pytest-qt", "pytest-mock"],
-    python_requires=">=3.8",
+    python_requires=">=3.8, <=3.11",  # limiting to 3.11 until ecmwflibs is not available for 3.12
     extras_require=extras_require,
     packages=find_packages(),
     entry_points={

uwsift/etc/SIFT/config/limit_available_readers.yaml

@@ -9,6 +9,8 @@ data_reading:
     - fci_l1c_nc
     - fci_l1c_iqt_fdhsi
     - fci_l2_nc
+    - fci_l2_bufr
+    - fci_l2_grib
     - li_l1b_nc
     - li_l1b_bck_nc_sift
     - li_l2_nc

uwsift/etc/SIFT/config/readers/fci_l2_bufr.yaml

@@ -0,0 +1,5 @@
+data_reading:
+  fci_l2_bufr:
+    filter_patterns: ['{pflag}_{location_indicator},{data_designator},MTI{spacecraft_id:1d}+FCI-2-{type}-{subtype}-{coverage}-{subsetting}-{component1}-{component2}-{component3}-{purpose}-BUFR_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility_or_tool}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day:>04d}_{count_in_repeat_cycle:>04d}.bin']
+    reader_kwargs:
+       with_area_definition: True

uwsift/etc/SIFT/config/readers/fci_l2_grib.yaml

@@ -0,0 +1,3 @@
+data_reading:
+  fci_l2_grib:
+    filter_patterns: ['{pflag}_{location_indicator},{data_designator},MTI{spacecraft_id:1d}+FCI-2-{type}-{subtype}-{coverage}-{subsetting}-{component1}-{component2}-{component3}-{purpose}-GRIB2_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility_or_tool}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day:>04d}_{count_in_repeat_cycle:>04d}.bin']

uwsift/etc/SIFT/config/readers/li_l1b_nc.yaml

@@ -3,7 +3,7 @@ data_reading:
     group_keys: ['start_time']
     filter_patterns:
       [
-        '{pflag}_{location_indicator},{data_designator},MTGI{spacecraft_id}+LI-1B-{type}--{subtype}--{component1}-{component2}-{component3}-{purpose}-{format}_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility_or_tool}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day:>04d}_{count_in_repeat_cycle:>04d}.nc'
+        '{pflag}_{location_indicator},{data_designator},{spacecraft_id}+LI-1B-{type}--{subtype}--{component1}-{component2}-{component3}-{purpose}-{format}_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility_or_tool}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day:>04d}_{count_in_repeat_cycle:>04d}.nc'
       ]
     kind: 'DYNAMIC'
     style_attributes:

uwsift/etc/SIFT/config/readers/li_l2_nc.yaml

@@ -3,7 +3,7 @@ data_reading:
     group_keys: ['start_time']
     filter_patterns:
       [
-        '{pflag}_{location_indicator},{data_designator},MTGI{spacecraft_id}+LI-2-{type}--{subtype}--{component1}-{component2}-{component3}-{purpose}-{format}_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility_or_tool}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day:>04d}_{count_in_repeat_cycle:>04d}.nc'
+        '{pflag}_{location_indicator},{data_designator},{spacecraft_id}+LI-2-{type}--{subtype}--{component1}-{component2}-{component3}-{purpose}-{format}_{oflag}_{originator}_{processing_time:%Y%m%d%H%M%S}_{facility_or_tool}_{environment}_{start_time:%Y%m%d%H%M%S}_{end_time:%Y%m%d%H%M%S}_{processing_mode}_{special_compression}_{disposition_mode}_{repeat_cycle_in_day:>04d}_{count_in_repeat_cycle:>04d}.nc'
       ]
     kind: 'DYNAMIC'
     style_attributes: