Merge branch 'latest' into dependabot/github_actions/actions/cache-3

sourmash-bio · Apr 25, 2022 · 863976c · 863976c
2 parents 4d4c468 + 519033a
commit 863976c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/dev_envs.yml b/.github/workflows/dev_envs.yml
@@ -46,7 +46,7 @@ jobs:
           ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}-${{ hashFiles('environment.yml') }}
 
     - name: setup conda
-      uses: conda-incubator/setup-miniconda@e23d871804685e8c52189e5bd45e9145019f10af
+      uses: conda-incubator/setup-miniconda@35d1405e78aa3f784fe3ce9a2eb378d5eeb62169
       with:
         auto-update-conda: true
         python-version: 3.9

diff --git a/setup.cfg b/setup.cfg
@@ -56,7 +56,7 @@ where = src
 # this syntax may change in the future
 [options.extras_require]
 test =
-    pytest~=6.2.4
+    pytest>=6.2.4,<7.2.0
     pytest-cov~=2.12
     recommonmark
     hypothesis