another attempt to get right xarray

ACCESS-Community-Hub · Oct 17, 2024 · b53dc3e · b53dc3e
1 parent 418eadb
commit b53dc3e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git 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/[email protected]

diff --git 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
@@ -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
@@ -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
@@ -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