Merge branch 'main' into package_health

xarray-contrib · Oct 29, 2023 · 497bc71 · 497bc71
2 parents fdd5dcc + 97ee881
commit 497bc71
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 22 deletions.
diff --git a/.github/workflows/upstream-dev-ci.yml b/.github/workflows/upstream-dev-ci.yml
@@ -22,7 +22,7 @@ jobs:
     outputs:
       triggered: ${{ steps.detect-trigger.outputs.trigger-found }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 2
       - uses: xarray-contrib/ci-trigger@v1.1
@@ -51,22 +51,23 @@ jobs:
     outputs:
       artifacts_availability: ${{ steps.status.outputs.ARTIFACTS_AVAILABLE }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
-          fetch-depth: 0 # Fetch all history for all branches and tags
-      - uses: conda-incubator/setup-miniconda@v2
+          fetch-depth: 0 # Fetch all history for all branches and tags.
+      - name: setup conda (micromamba)
+        uses: mamba-org/setup-micromamba@v1
         with:
-          channels: conda-forge
-          channel-priority: strict
-          mamba-version: "*"
-          activate-environment: xskillscore-dev
-          auto-update-conda: false
-          python-version: ${{ matrix.python-version }}
+          environment-file: ci/dev.yml
+          environment-name: xskillscore-dev
+          cache-environment: true
+          create-args: >-
+            python=${{ matrix.python-version }}
+            pytest-reportlog
+            conda
       - name: Set up conda environment
         run: |
-          mamba env update -f ci/dev.yml
           bash ci/install-upstream-wheels.sh
-      - name: Install xskillscore
+      - name: Install xskillscore no deps
         run: |
           python -m pip install --no-deps -e .
       - name: Version info

diff --git a/ci/dev.yml b/ci/dev.yml
@@ -2,7 +2,7 @@ name: xskillscore-dev
 channels:
   - conda-forge
 dependencies:
-  - python >=3.9
+  - python >= 3.9,<3.12
   # Documentation
   - nbsphinx
   - nbstripout

diff --git a/ci/install-upstream-wheels.sh b/ci/install-upstream-wheels.sh
@@ -6,26 +6,22 @@ conda uninstall -y --force \
     dask \
     cftime \
     bottleneck \
+    scipy \
     xarray \
     xhistogram \
     xskillscore
 
-
 # to limit the runtime of Upstream CI
-python -m pip install pytest-timeout
 python -m pip install \
-    -i https://pypi.anaconda.org/scipy-wheels-nightly/simple \
+    -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
     --no-deps \
     --pre \
     --upgrade \
     numpy \
+    scipy \
+    matplotlib \
     pandas
-python -m pip install \
-    -f https://7933911d6844c6c53a7d-47bd50c35cd79bd838daf386af554a83.ssl.cf2.rackcdn.com \
-    --no-deps \
-    --pre \
-    --upgrade \
-    matplotlib
+python -m pip install pytest-timeout
 python -m pip install \
     --no-deps \
     --upgrade \