Try fix

dask · Oct 2, 2023 · dbbbdc0 · dbbbdc0
1 parent 43c4771
commit dbbbdc0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 21 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,26 +4,24 @@ on: [push, pull_request]
 
 jobs:
   test:
-    name: ${{ matrix.os }} ${{ matrix.python-version }}
+    name: ${{ matrix.os }} ${{ matrix.environment }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.9", "3.10", "3.11"]
-        environment: [continuous_integration/environment.yml]
+        environment: ["3.9", "3.10", "3.11"]
         include:
           - os: windows-latest
-            python-version: "3.9"
+            environment: "3.9"
           - os: windows-latest
-            python-version: "3.11"
+            environment: "3.11"
           - os: macos-latest
-            python-version: "3.9"
+            environment: "3.9"
           - os: macos-latest
-            python-version: "3.11"
+            environment: "3.11"
           - os: ubuntu-latest
-            python-version: "3.9"
-            environment: continuous_integration/environment-no-optional-deps.yml
+            environment: nodeps
 
     steps:
       - name: Checkout source
@@ -37,10 +35,10 @@ jobs:
           miniforge-variant: Mambaforge
           miniforge-version: latest
           use-mamba: true
+          channel-priority: strict
+          environment-file: continuous_integration/environment-${{ matrix.environment }}.yml
           activate-environment: test
-          condarc-file: continuous_integration/condarc
-          python-version: ${{ matrix.python-version }}
-          environment-file: ${{ matrix.environment }}
+          auto-activate-base: false
 
       - name: Install zict
         shell: bash -l {0}

diff --git a/continuous_integration/condarc b/continuous_integration/condarc
diff --git a/continuous_integration/environment-3.10.yml b/continuous_integration/environment-3.10.yml
@@ -0,0 +1,11 @@
+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python =3.10
+  - psutil  # Enables extra tests
+  - python-lmdb  # Optional dependency
+  - pytest
+  - pytest-asyncio
+  - pytest-repeat
+  - pytest-timeout
diff --git a/continuous_integration/environment-3.11.yml b/continuous_integration/environment-3.11.yml
@@ -0,0 +1,11 @@
+name: test
+channels:
+  - conda-forge
+dependencies:
+  - python =3.11
+  - psutil  # Enables extra tests
+  - python-lmdb  # Optional dependency
+  - pytest
+  - pytest-asyncio
+  - pytest-repeat
+  - pytest-timeout
diff --git a/continuous_integration/environment.yml → continuous_integration/environment-3.9.yml b/continuous_integration/environment.yml → continuous_integration/environment-3.9.yml
@@ -2,6 +2,7 @@ name: test
 channels:
   - conda-forge
 dependencies:
+  - python =3.9
   - psutil  # Enables extra tests
   - python-lmdb  # Optional dependency
   - pytest

diff --git a/...egration/environment-no-optional-deps.yml → ...inuous_integration/environment-nodeps.yml b/...egration/environment-no-optional-deps.yml → ...inuous_integration/environment-nodeps.yml
@@ -2,6 +2,7 @@ name: test
 channels:
   - conda-forge
 dependencies:
+  - python =3.9
   - pytest
   - pytest-asyncio
   - pytest-repeat