Merge pull request #1292 from DestinE-Climate-DT/preparation0.11.0

Preparation for release v0.11

Author: oloapinivad

.github/ISSUE_TEMPLATE/01-bug-report.yml

@@ -49,6 +49,7 @@ body:
       description: Which AQUA version are you using?
       options:
       - main
+      - v0.11
       - v0.10.3
       - v0.10.2
       - v0.10.1

CHANGELOG.md

@@ -7,6 +7,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 Unreleased in the current development version:
 
+## [v0.11]
+
+Attention: this version is not compatible with catalog entries with ecCodes >= 2.35.0.
+
+1. LRA supports multi-catalog structure
+2. ecCodes temporarily restricted to < 2.34
+
 AQUA core complete list:
 - Refactor the fdb-catalog-generator tool to work with data-portfolio repository (#1275)
 - Introduce a function to convert NetCDF to Zarr and zarr catalog entry for LRA (#1068)
@@ -21,8 +28,11 @@ AQUA diagnostic complete list:
 - Teleconnections: catalog feature bugfix (#1276)
 
 ## [v0.10.3]
+
+Attention: this version is not compatible with catalog entries with ecCodes < 2.35.0.
+
 Main changes are:
-1. support for ecCodes >= 2.35.0
+1. support for ecCodes >= 2.35.0 (to be used with caution, not working with exps with eccodes < 2.35.0)
 2. fdb_path is deprecated in favour of fdb_home
 
 AQUA core complete list:
@@ -588,7 +598,8 @@ This is mostly built on the `AQUA` `Reader` class which support for climate mode
 This is the AQUA pre-release to be sent to internal reviewers. 
 Documentations is completed and notebooks are working.
 
-[unreleased]: https://github.com/DestinE-Climate-DT/AQUA/compare/v0.10.3...HEAD
+[unreleased]: https://github.com/DestinE-Climate-DT/AQUA/compare/v0.11...HEAD
+[v0.11]: https://github.com/DestinE-Climate-DT/AQUA/compare/v0.10.3...v0.11
 [v0.10.3]:https://github.com/DestinE-Climate-DT/AQUA/compare/v0.10.2...v0.10.3
 [v0.10.2]: https://github.com/DestinE-Climate-DT/AQUA/compare/v0.10.1...v0.10.2
 [v0.10.1]: https://github.com/DestinE-Climate-DT/AQUA/compare/v0.10...v0.10.1

aqua/__init__.py

@@ -6,7 +6,7 @@
 from .slurm import squeue, job, output_dir, scancel, max_resources_per_node
 from .accessor import AquaAccessor
 
-__version__ = '0.10.3'
+__version__ = '0.11'
 
 __all__ = ["plot_single_map", "plot_maps", "plot_single_map_diff", "plot_timeseries",
            "plot_hovmoller",

cli/levante-container/load_container_levante.sh

@@ -12,7 +12,7 @@ else
     # Your subsequent commands here
 fi
 setup_log_level 2 # 1=DEBUG, 2=INFO, 3=WARNING, 4=ERROR, 5=CRITICAL
-AQUA_container="/work/bb1153/b382289/container/AQUA/aqua-v0.10.3.sif"
+AQUA_container="/work/bb1153/b382289/container/AQUA/aqua-v0.11.sif"
 GRID_DEFINITION_PATH="/work/bb1153/b382321/grid_definitions"
 
 # Simple command line parsing

cli/levante-container/slurm_job_container.sh

@@ -11,7 +11,7 @@
 set -e
 
 # export AQUA = PATH_TO_AQUA_repo
-AQUA_container="/work/bb1153/b382289/container/AQUA/aqua-v0.10.3.sif"
+AQUA_container="/work/bb1153/b382289/container/AQUA/aqua-v0.11.sif"
 GRID_DEFINITION_PATH="/work/bb1153/b382321/grid_definitions"
 
 module load singularity

cli/lumi-container/load_container_lumi.sh

@@ -12,7 +12,7 @@ else
     # Your subsequent commands here
 fi
 setup_log_level 2 # 1=DEBUG, 2=INFO, 3=WARNING, 4=ERROR, 5=CRITICAL
-AQUA_container="/project/project_465000454/containers/aqua/aqua-v0.10.3.sif"
+AQUA_container="/project/project_465000454/containers/aqua/aqua-v0.11.sif"
 GSV_WEIGHTS_PATH="/scratch/project_465000454/igonzalez/gsv_weights/"
 GRID_DEFINITION_PATH="/scratch/project_465000454/igonzalez/grid_definitions"
 
@@ -71,7 +71,6 @@ log_message INFO "Perfect! Now it's time to ride with AQUA ⛵"
 
 singularity $cmd \
     --cleanenv \
-    --env FDB5_CONFIG_FILE=$FDB5_CONFIG_FILE \
     --env GSV_WEIGHTS_PATH=$GSV_WEIGHTS_PATH \
     --env GRID_DEFINITION_PATH=$GRID_DEFINITION_PATH \
     --env PYTHONPATH=/opt/conda/lib/python3.10/site-packages \

cli/lumi-container/slurm_job_container.sh

@@ -10,14 +10,13 @@
 #SBATCH -p debug    #change the partition
 
 AQUA_path=$AQUA
-AQUA_container=/project/project_465000454/containers/aqua/aqua-v0.10.3.sif
+AQUA_container=/project/project_465000454/containers/aqua/aqua-v0.11.sif
 GSV_WEIGHTS_PATH=/scratch/project_465000454/igonzalez/gsv_weights/
 GRID_DEFINITION_PATH=/scratch/project_465000454/igonzalez/grid_definitions
 
 # singularity shell can be an option depending on the requirement
 singularity exec \
     --cleanenv \
-    --env FDB5_CONFIG_FILE=$FDB5_CONFIG_FILE \
     --env GSV_WEIGHTS_PATH=$GSV_WEIGHTS_PATH \
     --env GRID_DEFINITION_PATH=$GRID_DEFINITION_PATH \
     --env PYTHONPATH=/opt/conda/lib/python3.10/site-packages \

cli/lumi-install/environment_lumi.yml

@@ -10,9 +10,7 @@ channels:
 dependencies:
   - python>=3.9
   - cdo>=2.2.0,<=2.4.0 #for healpix support
-  # for eccodes see issues #252, #634, #870
-  # PR #36 catalog repo
-  - ecCodes>=2.35.0
+  - eccodes>=2.31.0,<2.34.0
   - pandas      
   - pandoc
   - pip

cli/lumi-install/lumi_install.sh

@@ -146,11 +146,11 @@ create_aqua_file() {
   echo '# Load modules' >> $load_aqua_file
   # Removed, see issue #1195
   # echo 'module purge' >> $load_aqua_file
-  echo 'module load eccodes/2.36.0-cpeCray-23.09' >> $load_aqua_file
   echo 'module load fdb/5.12.1-cpeCray-23.09' >> $load_aqua_file
   # These are loaded automatically with the fdb module
   # echo 'module load eckit/1.26.3-cpeCray-23.09' >> $load_aqua_file
   # echo 'module load metkit/1.11.14-cpeCray-23.09' >> $load_aqua_file
+  # echo 'module load eccodes/2.36.0-cpeCray-23.09' >> $load_aqua_file
 
   log_message INFO "exports for FDB5 added to .bashrc. Please run 'source ~/.bashrc' to load the new configuration."
 

cli/marenostrum5-container/load_container_mn5.sh

@@ -14,7 +14,7 @@ fi
 setup_log_level 2 # 1=DEBUG, 2=INFO, 3=WARNING, 4=ERROR, 5=CRITICAL
 # If you don't have access to ehpc01, use the below bsc32 path
 # AQUA_container="/gpfs/projects/bsc32/DestinE/containers/aqua/aqua_0.9.2.sif"
-AQUA_container="/gpfs/projects/ehpc01/containers/aqua_0.10.3.sif"
+AQUA_container="/gpfs/projects/ehpc01/containers/aqua_0.11.sif"
 
 # Simple command line parsing
 user_defined_aqua="ask"

cli/marenostrum5-container/slurm_job_container.sh

@@ -12,7 +12,7 @@
 AQUA_path=$AQUA
 # If you don't have access to ehpc01, use the below bsc32 path
 # AQUA_container="/gpfs/projects/bsc32/DestinE/containers/aqua/aqua_0.9.2.sif"
-AQUA_container="/gpfs/projects/ehpc01/containers/aqua_0.10.3.sif"
+AQUA_container="/gpfs/projects/ehpc01/containers/aqua_0.11.sif"
 # singularity shell can be an option depending on the requirement
 singularity exec \
     --cleanenv \

environment.yml

@@ -10,9 +10,9 @@ channels:
 dependencies:
   - python>=3.9
   - cdo>=2.2.0,<=2.4.0 #for healpix support
-  # for eccodes see issues #252, #634, #870
+  # for eccodes see issues #252, #634, #870, #1282
   # PR #36 catalog repo
-  - eccodes>=2.35.0 
+  - eccodes>=2.31.0,<2.34.0
   - pandas      
   - pandoc
   - pip

pyproject.toml

@@ -55,7 +55,7 @@ dependencies = [
     "kerchunk",
     "h5py",
     "pyfdb@git+https://github.com/ecmwf/[email protected]",
-    "gsv@git+https://oauth2:[email protected]/gitlab/digital-twins/de_340-2/gsv_interface.git@v2.2.0"
+    "gsv@git+https://oauth2:[email protected]/gitlab/digital-twins/de_340-2/gsv_interface.git@v2.4.0"
 ]
 
 [project.optional-dependencies]