Merge pull request #250 from cisaacstern/test-upstream-dev-versions

Add upstream dev matrix to tests
pangeo-forge · Dec 3, 2021 · 4f8c052 · 4f8c052
2 parents 5355479 + e73ab9a
commit 4f8c052
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -51,6 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9]
+        dependencies: ["releases-only", "upstream-dev"]
     steps:
       - uses: actions/checkout@v2
       - name: 🔁 Setup Python
@@ -76,11 +77,14 @@ jobs:
         name: 🗃 Cache environment
         with:
           path: /usr/share/miniconda3/envs/pangeo-forge-recipes
-          key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ hashFiles( env.env_file ) }}-${{ env.CACHE_NUMBER }}
+          key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ hashFiles( env.env_file ) }}-${{ matrix.dependencies }}-${{ env.CACHE_NUMBER }}
         id: conda-cache
       - name: 🐫 Maybe Update environment
         if: steps.conda-cache.outputs.cache-hit != 'true'
         run: mamba env update -n pangeo-forge-recipes -f ${{ env.env_file }}
+      - name: 🧑‍💻 Maybe update to upstream dev versions
+        if: matrix.dependencies == 'upstream-dev'
+        run: mamba env update -n pangeo-forge-recipes -f ci/upstream-dev.yml
       - name: 🐍 List conda env
         shell: bash -l {0}
         run: |
@@ -93,13 +97,18 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [3.8, 3.9]
+        dependencies: ["releases-only", "upstream-dev"]
         pytest-mark: ["no_executor", "executor_function", "executor_generator",
                       "executor_dask", "executor_prefect", "executor_prefect_dask",
                       "executor_beam"]
         exclude:
           # No beam support in python 3.9
           - python-version: 3.9
             pytest-mark: "executor_beam"
+          - dependencies: "upstream-dev"
+            pytest-mark: "executor_function"
+          - dependencies: "upstream-dev"
+            pytest-mark: "executor_generator"
     steps:
       - uses: actions/checkout@v2
       - name: 🎯 Set cache number
@@ -113,7 +122,7 @@ jobs:
         name: 🗃 Loaded Cached environment
         with:
           path: /usr/share/miniconda3/envs/pangeo-forge-recipes
-          key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ hashFiles( env.env_file ) }}-${{ env.CACHE_NUMBER }}
+          key: ${{ runner.os }}-conda-${{ matrix.python-version }}-${{ hashFiles( env.env_file ) }}-${{ matrix.dependencies }}-${{ env.CACHE_NUMBER }}
         id: conda-cache
       - name: 🤿  Bail out if no cache hit
         if: steps.conda-cache.outputs.cache-hit != 'true'

diff --git a/ci/upstream-dev.yml b/ci/upstream-dev.yml
@@ -0,0 +1,9 @@
+name: pangeo-forge-recipes
+
+dependencies:
+  - pip
+  - pip:
+    - "git+https://github.com/dask/dask.git"
+    - "git+https://github.com/fsspec/filesystem_spec.git"
+    - "git+https://github.com/PrefectHQ/prefect.git"
+    - "git+https://github.com/pydata/xarray.git"