From 4560294d99714ec734009e4904965bd979ccd7ae Mon Sep 17 00:00:00 2001 From: Kamlesh Date: Tue, 7 Jan 2025 11:55:53 +0530 Subject: [PATCH 1/4] Update attribute name to fix the non-acceptance of cli kwargs for earthengine --- weather_mv/loader_pipeline/ee.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/weather_mv/loader_pipeline/ee.py b/weather_mv/loader_pipeline/ee.py index ebad6b3a..ef9389ba 100644 --- a/weather_mv/loader_pipeline/ee.py +++ b/weather_mv/loader_pipeline/ee.py @@ -461,13 +461,13 @@ class ConvertToAsset(beam.DoFn, KwargsFactoryMixin): Attributes: ee_asset_type: The type of asset to ingest in the earth engine. Default: IMAGE. asset_location: The bucket location at which asset files will be pushed. - open_dataset_kwargs: A dictionary of kwargs to pass to xr.open_dataset(). + xarray_open_dataset_kwargs: A dictionary of kwargs to pass to xr.open_dataset(). disable_grib_schema_normalization: A flag to turn grib schema normalization off; Default: on. """ asset_location: str ee_asset_type: str = 'IMAGE' - open_dataset_kwargs: t.Optional[t.Dict] = None + xarray_open_dataset_kwargs: t.Optional[t.Dict] = None disable_grib_schema_normalization: bool = False group_common_hypercubes: t.Optional[bool] = False band_names_dict: t.Optional[t.Dict] = None @@ -493,7 +493,7 @@ def convert_to_asset(self, queue: Queue, uri: str): job_start_time = get_utc_timestamp() with open_dataset(uri, - self.open_dataset_kwargs, + self.xarray_open_dataset_kwargs, self.disable_grib_schema_normalization, initialization_time_regex=self.initialization_time_regex, forecast_time_regex=self.forecast_time_regex, From 8e6cd1d2655f9c5c685a0b2544bafd732b7cb4c4 Mon Sep 17 00:00:00 2001 From: Kamlesh Date: Tue, 7 Jan 2025 15:12:17 +0530 Subject: [PATCH 2/4] Removed mambaforge as it deprecated and is equivalent to MiniForge3 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f337d172..77c4c716 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -55,7 +55,7 @@ jobs: channels: conda-forge environment-file: ci${{ matrix.python-version}}.yml activate-environment: weather-tools - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest use-mamba: true - name: Check MetView's installation From bb8b486713364e8589c3492315e1ccc7038bd7de Mon Sep 17 00:00:00 2001 From: Kamlesh Date: Tue, 7 Jan 2025 15:52:28 +0530 Subject: [PATCH 3/4] Update attribute name to fix the non-acceptance of cli kwargs for earthengine --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 77c4c716..1436fa0e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -118,7 +118,7 @@ jobs: channels: conda-forge environment-file: ci${{ matrix.python-version}}.yml activate-environment: weather-tools - miniforge-variant: Mambaforge + miniforge-variant: Miniforge3 miniforge-version: latest use-mamba: true - name: Install weather-tools[test] From fd81fb63d02e8b35419616d12c4890725a1ea6ff Mon Sep 17 00:00:00 2001 From: Kamlesh Date: Tue, 7 Jan 2025 16:53:26 +0530 Subject: [PATCH 4/4] Updated the version to 0.2.33 --- weather_mv/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/weather_mv/setup.py b/weather_mv/setup.py index 37f92038..047a93c6 100644 --- a/weather_mv/setup.py +++ b/weather_mv/setup.py @@ -65,7 +65,7 @@ packages=find_packages(), author='Anthromets', author_email='anthromets-ecmwf@google.com', - version='0.2.32', + version='0.2.33', url='https://weather-tools.readthedocs.io/en/latest/weather_mv/', description='A tool to load weather data into BigQuery.', install_requires=beam_gcp_requirements + base_requirements,