better formatting of YAML, synchronize dependencies

Author: Zeitsperre

.codacy.yml

@@ -1,8 +1,8 @@
 ---
 engines:
- pylint:
-   enabled: true
-   python_version: 3
+  pylint:
+    enabled: true
+    python_version: 3
 exclude_paths:
   - 'tests/**'
   - 'docs/source/conf.py'

.github/workflows/main.yml

@@ -44,8 +44,8 @@ jobs:
       run:
         shell: bash -l {0}
     strategy:
-        matrix:
-            python-version: [ "3.10", "3.11", "3.12"]
+      matrix:
+        python-version: [ "3.10", "3.11", "3.12" ]
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2

.readthedocs.yml

@@ -13,12 +13,12 @@ sphinx:
   fail_on_warning: false
 
 # Optionally build your docs in additional formats such as PDF and ePub
-formats: []
+formats: [ ]
 
 build:
-  os: ubuntu-22.04
+  os: ubuntu-lts-latest
   tools:
-    python: "mambaforge-22.9"
+    python: "mambaforge-latest"
 
 conda:
   environment: environment-docs.yml

.yamllint.yaml

@@ -1,8 +1,39 @@
 ---
 
 rules:
+
+  brackets:
+    forbid: false
+    min-spaces-inside: 1
+    max-spaces-inside: 1
+
+  commas:
+    min-spaces-after: 1
+
   document-start: disable
+
+  float-values:
+    require-numeral-before-decimal: true
+
+  hyphens:
+    max-spaces-after: 1
+
+  indentation:
+    indent-sequences: whatever
+    spaces: consistent
+
+  key-duplicates:
+    forbid-duplicated-merge-keys: true
+
   line-length:
-    max: 120
+    allow-non-breakable-words: true
+    allow-non-breakable-inline-mappings: true
+    max: 140
     level: warning
+
+  new-lines:
+    type: unix
+
+  trailing-spaces: {}
+
   truthy: disable

environment-docs.yml

@@ -13,4 +13,4 @@ dependencies:
   - sphinx >=7.0.0
   - sphinxcontrib-bibtex >=2.6.0
   - xarray >=2023.01.0,<2023.11.0
-  - xclim =0.43 # remember to match xclim version in requirements_docs.txt as well
+  - xclim ==0.52.2 # remember to match xclim version in requirements_docs.txt as well

environment.yml

@@ -2,7 +2,7 @@ name: finch
 channels:
   - conda-forge
 dependencies:
-  - python >=3.9,<3.13
+  - python >=3.10,<3.13
   - pip >=24.2.0
   - anyascii >=0.3.0
   - cftime >=1.4.1
@@ -12,7 +12,6 @@ dependencies:
   - dask >=2023.5.1
   - distributed
   - geopandas !=0.13.1
-  - h5netcdf
   - netcdf4 <=1.6.5
   - numpy >=1.23.0
   - pandas >=2.2.0

finch/datasets.yml

@@ -6,8 +6,8 @@ candcs-u5:
   suffix: "*.nc"
   pattern: "{variable}_{frequency}_BCCAQv2+ANUSPLIN300_{model}_{scenario}_{realization}_{date_start}-{date_end}.nc"
   allowed_values:
-    scenario: [rcp26, rcp45, rcp85]
-    variable: [tasmin, tasmax, pr]
+    scenario: [ rcp26, rcp45, rcp85 ]
+    variable: [ tasmin, tasmax, pr ]
     model:
       &u5models
       - BNU-ESM
@@ -39,18 +39,18 @@ candcs-u5:
     24models: *u5models
     pcic12:
     # taken from: https://www.pacificclimate.org/data/statistically-downscaled-climate-scenarios
-      - [ ACCESS1-0 , r1i1p1 ]
-      - [ CCSM4 , r2i1p1 ]
-      - [ CNRM-CM5 , r1i1p1 ]
-      - [ CSIRO-Mk3-6-0 , r1i1p1 ]
-      - [ CanESM2 , r1i1p1 ]
-      - [ GFDL-ESM2G , r1i1p1 ]
-      - [ HadGEM2-CC , r1i1p1 ]
-      - [ HadGEM2-ES , r1i1p1 ]
-      - [ MIROC5 , r3i1p1 ]
-      - [ MPI-ESM-LR , r3i1p1 ]
-      - [ MRI-CGCM3 , r1i1p1 ]
-      - [ inmcm4 , r1i1p1 ]
+      - [ ACCESS1-0, r1i1p1 ]
+      - [ CCSM4, r2i1p1 ]
+      - [ CNRM-CM5, r1i1p1 ]
+      - [ CSIRO-Mk3-6-0, r1i1p1 ]
+      - [ CanESM2, r1i1p1 ]
+      - [ GFDL-ESM2G, r1i1p1 ]
+      - [ HadGEM2-CC, r1i1p1 ]
+      - [ HadGEM2-ES, r1i1p1 ]
+      - [ MIROC5, r3i1p1 ]
+      - [ MPI-ESM-LR, r3i1p1 ]
+      - [ MRI-CGCM3, r1i1p1 ]
+      - [ inmcm4, r1i1p1 ]
 
 # This is a copy of the above for backward compatibility reasons.
 bccaqv2: *candcsu5
@@ -62,7 +62,7 @@ candcs-u6:
   pattern: "{variable}_{frequency}_BCCAQv2+ANUSPLIN300_{model}_{scenario}_{realization}_{}_{date_start}-{date_end}.nc"
   allowed_values:
     scenario: [ ssp126, ssp245, ssp585 ]
-    variable: [ tasmin, tasmax, pr]
+    variable: [ tasmin, tasmax, pr ]
     model:
       - ACCESS-CM2
       - ACCESS-ESM1-5
@@ -92,61 +92,61 @@ candcs-u6:
       - UKESM1-0-LL
   model_lists:
     26models:
-        - ACCESS-CM2
-        - ACCESS-ESM1-5
-        - BCC-CSM2-MR
-        - CMCC-ESM2
-        - CNRM-CM6-1
-        - CNRM-ESM2-1
-        - CanESM5
-        - [EC-Earth3, r4i1p1f1]
-        - EC-Earth3-Veg
-        - FGOALS-g3
-        - GFDL-ESM4
-        - HadGEM3-GC31-LL
-        - INM-CM4-8
-        - INM-CM5-0
-        - IPSL-CM6A-LR
-        - [KACE-1-0-G, r2i1p1f1]
-        - KIOST-ESM
-        - MIROC-ES2L
-        - MIROC6
-        - MPI-ESM1-2-HR
-        - MPI-ESM1-2-LR
-        - MRI-ESM2-0
-        - NorESM2-LM
-        - NorESM2-MM
-        - TaiESM1
-        - UKESM1-0-LL
+      - ACCESS-CM2
+      - ACCESS-ESM1-5
+      - BCC-CSM2-MR
+      - CMCC-ESM2
+      - CNRM-CM6-1
+      - CNRM-ESM2-1
+      - CanESM5
+      - [ EC-Earth3, r4i1p1f1 ]
+      - EC-Earth3-Veg
+      - FGOALS-g3
+      - GFDL-ESM4
+      - HadGEM3-GC31-LL
+      - INM-CM4-8
+      - INM-CM5-0
+      - IPSL-CM6A-LR
+      - [ KACE-1-0-G, r2i1p1f1 ]
+      - KIOST-ESM
+      - MIROC-ES2L
+      - MIROC6
+      - MPI-ESM1-2-HR
+      - MPI-ESM1-2-LR
+      - MRI-ESM2-0
+      - NorESM2-LM
+      - NorESM2-MM
+      - TaiESM1
+      - UKESM1-0-LL
 
 humidex-daily:
   local: false
   depth: 1
   path: https://pavics.ouranos.ca/twitcher/ows/proxy/thredds/catalog/birdhouse/eccc/CCCS_humidex/Humidex/daily/catalog.html
   pattern: "{variable}_MBCn_ERA5-Land_{model}_{scenario}_{realization}_{date_start}-{date_end}.nc"
   allowed_values:
-    scenario: [ssp126, ssp245, ssp585]
-    variable: [HXmax]
+    scenario: [ ssp126, ssp245, ssp585 ]
+    variable: [ HXmax ]
     model:
       &hxmax_day_models
-        - MPI-ESM1-2-HR
-        - EC-Earth3
-        - ACCESS-CM2
-        - MIROC-ES2L
-        - EC-Earth3-Veg
-        - IPSL-CM6A-LR
-        - INM-CM5-0
-        - FGOALS-g3
-        - CanESM5
-        - MIROC6
-        - GISS-E2-1-G
-        - EC-Earth3-Veg-LR
-        - CNRM-ESM2-1
-        - MPI-ESM1-2-LR
-        - INM-CM4-8
-        - MRI-ESM2-0
-        - CMCC-ESM2
-        - ACCESS-ESM1-5
-        - CNRM-CM6-1
+      - MPI-ESM1-2-HR
+      - EC-Earth3
+      - ACCESS-CM2
+      - MIROC-ES2L
+      - EC-Earth3-Veg
+      - IPSL-CM6A-LR
+      - INM-CM5-0
+      - FGOALS-g3
+      - CanESM5
+      - MIROC6
+      - GISS-E2-1-G
+      - EC-Earth3-Veg-LR
+      - CNRM-ESM2-1
+      - MPI-ESM1-2-LR
+      - INM-CM4-8
+      - MRI-ESM2-0
+      - CMCC-ESM2
+      - ACCESS-ESM1-5
+      - CNRM-CM6-1
   model_lists:
     humidex_models: *hxmax_day_models

tests/test_data.yml

@@ -5,8 +5,8 @@ test_single_cell:
   suffix: "*.nc"
   pattern: "{variable}_{frequency}_BCCAQv2+ANUSPLIN300_{model}_{scenario}_{realization}_{date_start}-{date_end}.nc"
   allowed_values:
-    scenario: [rcp26, rcp45, rcp85]
-    variable: [tasmin, tasmax, pr]
+    scenario: [ rcp26, rcp45, rcp85 ]
+    variable: [ tasmin, tasmax, pr ]
     model:
       &u5models
       - BNU-ESM
@@ -37,19 +37,19 @@ test_single_cell:
     # The absence of realization specification implies r1 is taken.
     24models: *u5models
     pcic12:
-    # taken from: https://www.pacificclimate.org/data/statistically-downscaled-climate-scenarios
-      - [ ACCESS1-0 , r1i1p1 ]
-      - [ CCSM4 , r2i1p1 ]
-      - [ CNRM-CM5 , r1i1p1 ]
-      - [ CSIRO-Mk3-6-0 , r1i1p1 ]
-      - [ CanESM2 , r1i1p1 ]
-      - [ GFDL-ESM2G , r1i1p1 ]
-      - [ HadGEM2-CC , r1i1p1 ]
-      - [ HadGEM2-ES , r1i1p1 ]
-      - [ MIROC5 , r3i1p1 ]
-      - [ MPI-ESM-LR , r3i1p1 ]
-      - [ MRI-CGCM3 , r1i1p1 ]
-      - [ inmcm4 , r1i1p1 ]
+      # taken from: https://www.pacificclimate.org/data/statistically-downscaled-climate-scenarios
+      - [ ACCESS1-0, r1i1p1 ]
+      - [ CCSM4, r2i1p1 ]
+      - [ CNRM-CM5, r1i1p1 ]
+      - [ CSIRO-Mk3-6-0, r1i1p1 ]
+      - [ CanESM2, r1i1p1 ]
+      - [ GFDL-ESM2G, r1i1p1 ]
+      - [ HadGEM2-CC, r1i1p1 ]
+      - [ HadGEM2-ES, r1i1p1 ]
+      - [ MIROC5, r3i1p1 ]
+      - [ MPI-ESM-LR, r3i1p1 ]
+      - [ MRI-CGCM3, r1i1p1 ]
+      - [ inmcm4, r1i1p1 ]
 
 test_subset:
   local: true
@@ -58,8 +58,8 @@ test_subset:
   suffix: "*.nc"
   pattern: "{variable}_{model}_{scenario}_subset.nc"
   allowed_values:
-    scenario: [rcp26, rcp45]
-    variable: [tasmin, tasmax]
+    scenario: [ rcp26, rcp45 ]
+    variable: [ tasmin, tasmax ]
     model:
       - inmcm4
       - bcc-csm1-1
@@ -72,28 +72,28 @@ test_humidex:
   suffix: "*.nc"
   pattern: "{variable}_MBCn_ERA5-Land_{model}_{scenario}_{realization}_{date_start}-{date_end}_sub.nc"
   allowed_values:
-      scenario: [ssp245, ssp585 ]
-      variable: [ HXmax ]
-      model:
-        &hxmax_day_sub
-          - MPI-ESM1-2-HR
-          - EC-Earth3
-          - ACCESS-CM2
-          - MIROC-ES2L
-          - EC-Earth3-Veg
-          - IPSL-CM6A-LR
-          - INM-CM5-0
-          - FGOALS-g3
-          - CanESM5
-          - MIROC6
-          - GISS-E2-1-G
-          - EC-Earth3-Veg-LR
-          - CNRM-ESM2-1
-          - MPI-ESM1-2-LR
-          - INM-CM4-8
-          - MRI-ESM2-0
-          - CMCC-ESM2
-          - ACCESS-ESM1-5
-          - CNRM-CM6-1
+    scenario: [ ssp245, ssp585 ]
+    variable: [ HXmax ]
+    model:
+      &hxmax_day_sub
+      - MPI-ESM1-2-HR
+      - EC-Earth3
+      - ACCESS-CM2
+      - MIROC-ES2L
+      - EC-Earth3-Veg
+      - IPSL-CM6A-LR
+      - INM-CM5-0
+      - FGOALS-g3
+      - CanESM5
+      - MIROC6
+      - GISS-E2-1-G
+      - EC-Earth3-Veg-LR
+      - CNRM-ESM2-1
+      - MPI-ESM1-2-LR
+      - INM-CM4-8
+      - MRI-ESM2-0
+      - CMCC-ESM2
+      - ACCESS-ESM1-5
+      - CNRM-CM6-1
   model_lists:
-      humidex_submods: *hxmax_day_sub
+    humidex_submods: *hxmax_day_sub