Merge pull request #83 from climate-resource/hotfix-ci

Update expected hash
climate-resource · Jan 16, 2025 · b220e6b · b220e6b
2 parents 06f055b + 938fc3b
commit b220e6b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 15 deletions.
diff --git a/changelog/83.fix.md b/changelog/83.fix.md
@@ -0,0 +1 @@
+Updated the expected hash for HadCRUT5
diff --git a/ci-config.yaml b/ci-config.yaml
@@ -298,7 +298,7 @@ retrieve_and_process_droste_et_al_2020_data:
     url: https://zenodo.org/records/3519317/files/Trends-Emission_PFCs_Droste-etal_ACP_20191025.zip?download=1
 retrieve_and_process_epica_data:
 - download_url:
-    known_hash: 26c9259d69bfe390f521d1f651de8ea37ece5bbb95b43df749ba4e00f763e9fd
+    known_hash: 8cf4efd10a93a3783985c49e4dd0eba2aa02475f7afe7fbd147f7aae3229a267
     url: https://doi.pangaea.de/10.1594/PANGAEA.552232?format=textfile
   processed_data_with_loc_file: data/interim/epica/epica_with_location.csv
   raw_dir: data/raw/epica
@@ -342,7 +342,7 @@ retrieve_and_process_wmo_2022_ozone_assessment_ch7_data:
 retrieve_misc_data:
 - hadcrut5:
     download_url:
-      known_hash: 35ec055febd2107277e7ab965baec13ee2e0a36416e18220c8d9cbb5d509867c
+      known_hash: 98d9fa3bbbb4b36ed5eb8b11fcbc308e7b96c83f8ac21902e52d238246f790d8
       url: https://www.metoffice.gov.uk/hadobs/hadcrut5/data/HadCRUT.5.0.2.0/analysis/diagnostics/HadCRUT.5.0.2.0.analysis.summary_series.global.annual.nc
     raw_dir: data/raw/hadcrut5
   natural_earth:
@@ -379,7 +379,7 @@ smooth_law_dome_data:
   smoothed_draws_file: data/interim/law_dome/law-dome_ch4_smoothed_all-draws.csv
   smoothed_median_file: data/interim/law_dome/law-dome_ch4_smoothed_median.csv
   step_config_id: ch4
-version: 0.2.1a1-ci
+version: 0.3.0-ci
 write_input4mips:
 - complete_file: data/processed/esgf-ready/ch4_input4MIPs_esgf-ready.complete
   complete_file_check_data: data/processed/esgf-ready/ch4_input4MIPs_check-data.complete

diff --git a/ci-nightly-config.yaml b/ci-nightly-config.yaml
@@ -703,7 +703,7 @@ retrieve_and_process_droste_et_al_2020_data:
     url: https://zenodo.org/records/3519317/files/Trends-Emission_PFCs_Droste-etal_ACP_20191025.zip?download=1
 retrieve_and_process_epica_data:
 - download_url:
-    known_hash: 26c9259d69bfe390f521d1f651de8ea37ece5bbb95b43df749ba4e00f763e9fd
+    known_hash: 8cf4efd10a93a3783985c49e4dd0eba2aa02475f7afe7fbd147f7aae3229a267
     url: https://doi.pangaea.de/10.1594/PANGAEA.552232?format=textfile
   processed_data_with_loc_file: data/interim/epica/epica_with_location.csv
   raw_dir: data/raw/epica
@@ -747,7 +747,7 @@ retrieve_and_process_wmo_2022_ozone_assessment_ch7_data:
 retrieve_misc_data:
 - hadcrut5:
     download_url:
-      known_hash: 35ec055febd2107277e7ab965baec13ee2e0a36416e18220c8d9cbb5d509867c
+      known_hash: 98d9fa3bbbb4b36ed5eb8b11fcbc308e7b96c83f8ac21902e52d238246f790d8
       url: https://www.metoffice.gov.uk/hadobs/hadcrut5/data/HadCRUT.5.0.2.0/analysis/diagnostics/HadCRUT.5.0.2.0.analysis.summary_series.global.annual.nc
     raw_dir: data/raw/hadcrut5
   natural_earth:
@@ -826,7 +826,7 @@ smooth_law_dome_data:
   smoothed_draws_file: data/interim/law_dome/law-dome_n2o_smoothed_all-draws.csv
   smoothed_median_file: data/interim/law_dome/law-dome_n2o_smoothed_median.csv
   step_config_id: n2o
-version: 0.2.1a1-ci-nightly
+version: 0.3.0-ci-nightly
 write_input4mips:
 - complete_file: data/processed/esgf-ready/co2_input4MIPs_esgf-ready.complete
   complete_file_check_data: data/processed/esgf-ready/co2_input4MIPs_check-data.complete

diff --git a/dev-config.yaml b/dev-config.yaml
@@ -3428,7 +3428,7 @@ retrieve_and_process_droste_et_al_2020_data:
     url: https://zenodo.org/records/3519317/files/Trends-Emission_PFCs_Droste-etal_ACP_20191025.zip?download=1
 retrieve_and_process_epica_data:
 - download_url:
-    known_hash: 26c9259d69bfe390f521d1f651de8ea37ece5bbb95b43df749ba4e00f763e9fd
+    known_hash: 8cf4efd10a93a3783985c49e4dd0eba2aa02475f7afe7fbd147f7aae3229a267
     url: https://doi.pangaea.de/10.1594/PANGAEA.552232?format=textfile
   processed_data_with_loc_file: data/interim/epica/epica_with_location.csv
   raw_dir: data/raw/epica
@@ -3472,7 +3472,7 @@ retrieve_and_process_wmo_2022_ozone_assessment_ch7_data:
 retrieve_misc_data:
 - hadcrut5:
     download_url:
-      known_hash: 35ec055febd2107277e7ab965baec13ee2e0a36416e18220c8d9cbb5d509867c
+      known_hash: 98d9fa3bbbb4b36ed5eb8b11fcbc308e7b96c83f8ac21902e52d238246f790d8
       url: https://www.metoffice.gov.uk/hadobs/hadcrut5/data/HadCRUT.5.0.2.0/analysis/diagnostics/HadCRUT.5.0.2.0.analysis.summary_series.global.annual.nc
     raw_dir: data/raw/hadcrut5
   natural_earth:
@@ -3551,7 +3551,7 @@ smooth_law_dome_data:
   smoothed_draws_file: data/interim/law_dome/law-dome_n2o_smoothed_all-draws.csv
   smoothed_median_file: data/interim/law_dome/law-dome_n2o_smoothed_median.csv
   step_config_id: n2o
-version: 0.2.1a1-dev
+version: 0.3.0-dev
 write_input4mips:
 - complete_file: data/processed/esgf-ready/co2_input4MIPs_esgf-ready.complete
   complete_file_check_data: data/processed/esgf-ready/co2_input4MIPs_check-data.complete

diff --git a/notebooks/000y_retrieve-misc-data/0003_hadCRUT5.py b/notebooks/000y_retrieve-misc-data/0003_hadCRUT5.py
@@ -5,7 +5,7 @@
 #       extension: .py
 #       format_name: percent
 #       format_version: '1.3'
-#       jupytext_version: 1.16.1
+#       jupytext_version: 1.16.4
 #   kernelspec:
 #     display_name: Python 3 (ipykernel)
 #     language: python

diff --git a/pixi.lock b/pixi.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -28,8 +28,8 @@ editable = true
 
 # conda dependencies
 [tool.pixi.dependencies]
-input4mips-validation = "0.15.0"
-xarray = "2024.6.0"
+input4mips-validation = "==0.15.0"
+xarray = "==2024.6.0"
 doit = ">=0.36.0,<0.37"
 jupyterlab = ">=1.0"
 loguru-config = ">=0.1.0"

diff --git a/src/local/config_creation/epica_handling.py b/src/local/config_creation/epica_handling.py
@@ -16,7 +16,7 @@
         raw_dir=Path("data/raw/epica"),
         processed_data_with_loc_file=Path("data/interim/epica/epica_with_location.csv"),
         download_url=URLSource(
-            known_hash="26c9259d69bfe390f521d1f651de8ea37ece5bbb95b43df749ba4e00f763e9fd",
+            known_hash="8cf4efd10a93a3783985c49e4dd0eba2aa02475f7afe7fbd147f7aae3229a267",
             url="https://doi.pangaea.de/10.1594/PANGAEA.552232?format=textfile",
         ),
     )

diff --git a/src/local/config_creation/retrieve_misc_data.py b/src/local/config_creation/retrieve_misc_data.py
@@ -40,7 +40,7 @@
             download_url=URLSource(
                 # Use the analysis time series, rather than non-infilled
                 url="https://www.metoffice.gov.uk/hadobs/hadcrut5/data/HadCRUT.5.0.2.0/analysis/diagnostics/HadCRUT.5.0.2.0.analysis.summary_series.global.annual.nc",
-                known_hash="35ec055febd2107277e7ab965baec13ee2e0a36416e18220c8d9cbb5d509867c",
+                known_hash="98d9fa3bbbb4b36ed5eb8b11fcbc308e7b96c83f8ac21902e52d238246f790d8",
             ),
         ),
     )