Merge pull request #679 from ssec/dependabot/github_actions/actions/c…

…ache-4 Bump actions/cache from 3 to 4
ssec · Feb 2, 2024 · 86b4f28 · 86b4f28
2 parents 8b7e317 + b2a2756
commit 86b4f28
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,7 +45,7 @@ jobs:
           CONDA_PREFIX=$(python -c "import sys; print(sys.prefix)")
           echo "CONDA_PREFIX=$CONDA_PREFIX" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ env.CONDA_PREFIX }}
           key: ubuntu-latest-3.10-conda-${{ hashFiles('continuous_integration/environment.yaml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}
@@ -122,7 +122,7 @@ jobs:
           CONDA_PREFIX=$(python -c "import sys; print(sys.prefix)")
           echo "CONDA_PREFIX=$CONDA_PREFIX" >> $GITHUB_ENV
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ env.CONDA_PREFIX }}
           key: ${{ matrix.os }}-${{matrix.python-version}}-conda-${{ hashFiles('continuous_integration/environment.yaml') }}-${{ env.DATE }}-${{ env.CACHE_NUMBER }}

diff --git a/continuous_integration/environment.yaml b/continuous_integration/environment.yaml
@@ -37,7 +37,7 @@ dependencies:
   - scipy
   - zarr
   - xarray
-  - pytest
+  - pytest <8.0
   - pytest-cov
   - pytest-lazy-fixture
   - sphinx