From b53dc3e03c8c088b0339c4f7d5281b494e7a1781 Mon Sep 17 00:00:00 2001 From: Paola Petrelli Date: Thu, 17 Oct 2024 15:14:00 +1100 Subject: [PATCH] another attempt to get right xarray --- .github/workflows/mopper-test-conda.yaml | 1 + conda/environment.yaml | 2 -- conda/meta.yaml | 2 +- conda/testenv.yaml | 4 ++-- requirements.txt | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/mopper-test-conda.yaml b/.github/workflows/mopper-test-conda.yaml index 4381d37..ed06407 100644 --- a/.github/workflows/mopper-test-conda.yaml +++ b/.github/workflows/mopper-test-conda.yaml @@ -32,6 +32,7 @@ jobs: channels: conda-forge, coecms channel-priority: true environment-file: conda/environment.yaml # Path to the build conda environment + auto-update-conda: false show-channel-urls: true # - name: Build but do not upload the conda packages uses: uibcdf/action-build-and-upload-conda-packages@v1.3.0 diff --git a/conda/environment.yaml b/conda/environment.yaml index 008f244..1c06344 100644 --- a/conda/environment.yaml +++ b/conda/environment.yaml @@ -1,8 +1,6 @@ name: mopper_env channels: - conda-forge - - coecms - #- defaults dependencies: - anaconda-client diff --git a/conda/meta.yaml b/conda/meta.yaml index d987efb..1f00e3e 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -28,8 +28,8 @@ requirements: run: - python - click + - xarray>=v2024.05.0 - cmor - - xarray>=v2024.01.1 - numpy - dask - pyyaml diff --git a/conda/testenv.yaml b/conda/testenv.yaml index 69078be..02b4347 100644 --- a/conda/testenv.yaml +++ b/conda/testenv.yaml @@ -4,9 +4,9 @@ channels: - nodefaults dependencies: - - cmor - click - - xarray>=v2024.01.0 + - xarray>=v2024.05.0 + - cmor - numpy - dask - pyyaml diff --git a/requirements.txt b/requirements.txt index f37614d..f38e573 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ # Add general dependencies here # Optional dependencies e.g. [dev] are added in `test-requirements` click +xarray>=v2024.05.0 cmor -xarray>=v2024.01.0 numpy pyyaml dask