From ce2b78e064a78fb288eb7ea99b8dfe18305cdfcf Mon Sep 17 00:00:00 2001 From: Ian Langmore Date: Thu, 5 Dec 2024 09:31:20 -0800 Subject: [PATCH] Update weatherbench deps. Before this, we allowed `numpy < 2`, but this was causing issues with time compatibility. Partial upgrades resulted in other issues, so I upgraded numpy/pandas/xarray to be inline with current Google versions. PiperOrigin-RevId: 703143594 --- .github/workflows/ci-build.yml | 3 +-- .github/workflows/lint.yml | 3 +-- docs/contributing.md | 5 +---- setup.py | 9 +++++---- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index ab76217..ce5d7ff 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -16,8 +16,7 @@ jobs: strategy: fail-fast: false matrix: - # TODO(#3): Support Python 3.10 and 3.11. - python-version: ["3.9"] + python-version: ["3.11"] steps: - name: Cancel previous uses: styfle/cancel-workflow-action@0.7.0 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 8f9e613..a07a860 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,8 +16,7 @@ jobs: strategy: fail-fast: false matrix: - # TODO(#3): Support Python 3.10 and 3.11. - python-version: ["3.9"] + python-version: ["3.11"] steps: - name: Cancel previous uses: styfle/cancel-workflow-action@0.7.0 diff --git a/docs/contributing.md b/docs/contributing.md index c5df6fe..13bd9aa 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -33,12 +33,9 @@ for this purpose. If possible, consider reviewing [Google's Code Review Guide](h ### Development Setup -After cloning the project, we recommend creating a local Python3.9 environment +After cloning the project, we recommend creating a local Python3.11 environment for development (try [Miniconda](https://docs.conda.io/en/latest/miniconda.html)). -> Note: We'll soon support Python 3.10 & 3.11 ([#3](https://github.com/google-research/weatherbench2/issues/3)). -> At that point, we will recommend creating a Python3.10 environment. - To locally install the project for development, please run: ```shell pip install -e ".[tests]" diff --git a/setup.py b/setup.py index 4f1b984..618399c 100644 --- a/setup.py +++ b/setup.py @@ -17,12 +17,13 @@ base_requires = [ 'apache_beam>=2.31.0', + 'cftime>=1.6.2', 'jax[cpu]', - 'numpy', - 'pandas==2.0.3', + 'numpy>=2.1.3', + 'pandas>=2.2.3', 'scipy', 'scikit-learn', - 'xarray==2023.7.0', + 'xarray>=2024.11.0', 'xarray-beam', 'zarr', ] @@ -48,7 +49,7 @@ setuptools.setup( name='weatherbench2', - version='0.2.0', + version='0.2.1', license='Apache 2.0', author='Google LLC', author_email='noreply@google.com',