X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Frun-tests.yaml;h=4313cd26d46469f200fb897716f44c59ce81cd2b;hb=30c03874f25d3d76b47d0dab323b0b26a99c4b43;hp=198f8f80b0c77110fa2d1459b4239a4aa9a26f16;hpb=e59993738affbb44651c0b160b6b6bd1131629e7;p=ppu.git

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 198f8f8..4313cd2 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -4,12 +4,13 @@ on: [push, pull_request]
 
 jobs:
   run-tests:
+    env:
+      not_in_conda: "['3.11', 'pypy-3.7']"
 
     strategy:
-      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "pypy-2.7"]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.7"]
         include:
         - os: ubuntu-latest
           os-name: Linux
@@ -25,11 +26,16 @@ jobs:
 
       # Setup Python/pip
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: s-weigand/setup-conda@v1
         with:
           python-version: ${{ matrix.python-version }}
+        if: ${{ runner.os == 'Linux' && !contains(fromJSON(env.not_in_conda), matrix.python-version) }}
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python-version }}
+        if: ${{ runner.os != 'Linux' || contains(fromJSON(env.not_in_conda), matrix.python-version) }}
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ matrix.pip-cache-path }}
           key: ${{ runner.os }}-pip
@@ -45,7 +51,7 @@ jobs:
         run: |
           import os, sys
           if hasattr(sys, 'pypy_version_info'):
-            toxenv = 'pypy'
+            toxenv = 'pypy3'
           else:
             pyver = '%d%d' % tuple(sys.version_info[:2])
             toxenv = 'py%s' % pyver
@@ -58,4 +64,5 @@ jobs:
       - name: Run tox
         run: |
           python -c "import os; print(os.environ['TOXENV'])"
+          tox --version
           tox