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

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 7d2ac25..4313cd2 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -4,11 +4,13 @@ on: [push, pull_request]
 
 jobs:
   run-tests:
+    env:
+      not_in_conda: "['3.11', 'pypy-3.7']"
 
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy-2.7", "pypy-3.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
@@ -24,9 +26,14 @@ jobs:
 
       # Setup Python/pip
       - uses: actions/checkout@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@v3
         with:
@@ -44,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