-
Notifications
You must be signed in to change notification settings - Fork 47
Updgrade weather tools dependencies #517
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
Piyush-Ingale
wants to merge
16
commits into
google:main
Choose a base branch
from
Piyush-Ingale:update-weather-tools-dependencies
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
53dd863
Update dependency versions.
Piyush-Ingale b2f8448
Update beam and python version in Docekrfile
Piyush-Ingale c835226
Fix environment name
Piyush-Ingale 9f4d4b4
Uncomment necessary changes
Piyush-Ingale ff2b118
Fix weather-mv unittests and install libeccodes-dev in docker image
Piyush-Ingale dd8f5b0
Fix pip operator
Piyush-Ingale 7de4bce
Fix env name in environment.yml
Piyush-Ingale f9fb118
Upgrade beam version in setup.py
Piyush-Ingale 6f9bf56
Fix weather-dl unittests
Piyush-Ingale f822e77
clean up
Piyush-Ingale c4af842
Update readme
Piyush-Ingale f88621b
Update CI/CD yamls
Piyush-Ingale 2934e9e
Fix geojson version in ci.3.11.yml
Piyush-Ingale 45ed1bb
Fix pytype in ci.yml
Piyush-Ingale fc23503
Fix type check and unittests in CI
Piyush-Ingale c879031
Update tools minor version
Piyush-Ingale File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| name: weather-tools | ||
| channels: | ||
| - conda-forge | ||
| - defaults | ||
| dependencies: | ||
| - python=3.11 | ||
| - apache-beam=2.70.0 | ||
| - pytest=9.0.2 | ||
| - pytest-subtests=0.15.0 | ||
| - cfgrib=0.9.15.1 | ||
| - dask=2025.12.0 | ||
| - dataclasses=0.8 | ||
| - distributed=2025.12.0 | ||
| - eccodes=2.42.0 | ||
| - requests=2.32.5 | ||
| - netcdf4=1.7.2 | ||
| - rioxarray=0.19.0 | ||
| - xarray-beam=0.6.3 | ||
| - ecmwf-api-client=1.6.5 | ||
| - fsspec=2025.12.0 | ||
| - gcsfs=2025.12.0 | ||
| - gdal=3.10.0 | ||
| - libgdal-grib=3.10.0 | ||
| - pyproj=3.7.1 | ||
| - geojson=3.2.0 | ||
| - simplejson=3.20.2 | ||
| - metview-batch=5.23.0 | ||
| - numpy=2.2.6 | ||
| - pandas=2.3.3 | ||
| - pip=25.3 | ||
| - pygrib=2.1.8 | ||
| - google-cloud-sdk=550.0.0 | ||
| - aria2=1.37.0 | ||
| - xarray==2025.08.0 | ||
| - ruff==0.14.10 | ||
| - zarr=3.1.5 | ||
| - google-cloud-monitoring=2.28.0 | ||
| - pip: | ||
| - cython==3.2.3 | ||
| - earthengine-api==1.7.4 | ||
| - git+https://github.com/dabhicusp/cdsapi-beta-google-weather-tools.git@master#egg=cdsapi # TODO([#474](https://github.com/google/weather-tools/issues/474)): Compatible cdsapi with weather-dl. | ||
| - pyparsing==3.3.1 | ||
| - .[test] |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # doc requirements | ||
| myst-parser==0.13.7 | ||
| sphinx>=2.1 | ||
| Jinja2<3.1 | ||
| Jinja2<3.2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,20 +15,20 @@ | |
| from setuptools import find_packages, setup | ||
|
|
||
| beam_gcp_requirements = [ | ||
| "google-cloud-bigquery==2.34.4", | ||
| "google-cloud-bigquery-storage==2.14.1", | ||
| "google-cloud-bigtable==1.7.2", | ||
| "google-cloud-core==1.7.3", | ||
| "google-cloud-datastore==1.15.5", | ||
| "google-cloud-dlp==3.8.0", | ||
| "google-cloud-language==1.3.2", | ||
| "google-cloud-pubsub==2.13.4", | ||
| "google-cloud-pubsublite==1.4.2", | ||
| "google-cloud-recommendations-ai==0.2.0", | ||
| "google-cloud-spanner==1.19.3", | ||
| "google-cloud-videointelligence==1.16.3", | ||
| "google-cloud-vision==1.0.2", | ||
| "apache-beam[gcp]==2.40.0", | ||
| "google-cloud-bigquery==3.39.0", | ||
| "google-cloud-bigquery-storage==2.36.0", | ||
| "google-cloud-bigtable==2.35.0", | ||
| "google-cloud-core==2.5.0", | ||
| "google-cloud-datastore==2.23.0", | ||
| "google-cloud-dlp==3.33.0", | ||
| "google-cloud-language==2.18.0", | ||
| "google-cloud-pubsub==2.34.0", | ||
| "google-cloud-pubsublite==1.13.0", | ||
| "google-cloud-recommendations-ai==0.10.18", | ||
| "google-cloud-spanner==3.61.0", | ||
| "google-cloud-videointelligence==2.17.0", | ||
| "google-cloud-vision==3.11.0", | ||
| "apache-beam[gcp]==2.70.0", | ||
| ] | ||
|
|
||
| weather_dl_requirements = [ | ||
|
|
@@ -39,7 +39,7 @@ | |
| "requests>=2.24.0", | ||
| "google-cloud-firestore", | ||
| "firebase-admin", | ||
| "urllib3==1.26.5", | ||
| "urllib3==2.6.2", | ||
| ] | ||
|
|
||
| weather_mv_requirements = [ | ||
|
|
@@ -56,9 +56,9 @@ | |
| "earthengine-api>=0.1.263", | ||
| "pyproj", # requires separate binary installation! | ||
| "gdal", # requires separate binary installation! | ||
| "xarray-beam==0.6.2", | ||
| "gcsfs==2022.11.0", | ||
| "zarr==2.15.0", | ||
| "xarray-beam==0.6.3", | ||
| "gcsfs==2025.12.0", | ||
| "zarr==3.1.5", | ||
| ] | ||
|
|
||
| weather_sp_requirements = [ | ||
|
|
@@ -69,8 +69,8 @@ | |
| ] | ||
|
|
||
| test_requirements = [ | ||
| "pytype==2021.11.29", | ||
| "ruff==0.1.2", | ||
| "pytype==2024.02.09", | ||
| "ruff==0.14.10", | ||
| "pytest", | ||
| "pytest-subtests", | ||
| "netcdf4", | ||
|
|
@@ -110,21 +110,20 @@ | |
| 'Operating System :: MacOS :: MacOS X', | ||
| # 'Operating System :: Microsoft :: Windows', # TODO(#64): Fully support Windows. | ||
| 'Operating System :: POSIX', | ||
| 'Programming Language :: Python :: 3.8', | ||
| 'Programming Language :: Python :: 3.9', | ||
| 'Programming Language :: Python :: 3.11', | ||
| 'Topic :: Scientific/Engineering :: Atmospheric Science', | ||
|
|
||
| ], | ||
| python_requires='>=3.8, <3.10', | ||
| install_requires=['apache-beam[gcp]==2.40.0', 'gcsfs==2022.11.0'], | ||
| python_requires='>=3.11', | ||
| install_requires=['apache-beam[gcp]==2.70.0', 'apache-beam[dill]==2.70.0', 'gcsfs==2025.12.0'], | ||
| dependency_links=['https://github.com/dabhicusp/cdsapi-beta-google-weather-tools.git@master#egg=cdsapi'], # TODO([ | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can remove this, discuss with @dabhicusp. |
||
| #474](https://github.com/google/weather-tools/issues/474)): Compatible cdsapi with weather-dl. | ||
| use_scm_version=True, | ||
| setup_requires=['setuptools_scm'], | ||
| scripts=['weather_dl/weather-dl', 'weather_mv/weather-mv', 'weather_sp/weather-sp'], | ||
| tests_require=test_requirements, | ||
| extras_require={ | ||
| 'docs': ['tox', 'sphinx>=2.1', 'myst-parser', 'Jinja2<3.1'], | ||
| 'docs': ['tox', 'sphinx>=2.1', 'myst-parser', 'Jinja2<3.2'], | ||
| 'test': all_test_requirements, | ||
| 'dev': ['google-weather-tools[docs,test]'], | ||
| 'regrid': ['metview'] | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update
'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9',