X-Git-Url: https://git.phdru.name/?p=ppu.git;a=blobdiff_plain;f=.github%2Fworkflows%2Frun-tests.yaml;fp=.github%2Fworkflows%2Frun-tests.yaml;h=61d2d6fcc0dff0b4461bfe8998f9fb72acaac613;hp=53fc6044a5145435ccb00acf0fac7af625d11682;hb=042c7e70678df42c13cca5b3b2150ae30a29b7ab;hpb=559670ecaa3219690854c2a5dd7a54f6bcc328fc

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 53fc604..61d2d6f 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -5,12 +5,12 @@ on: [push, pull_request]
 jobs:
   run-tests:
     env:
-      not_in_conda: "['3.11', 'pypy-3.7']"
+      not_in_conda: "[]"
 
     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-3.7"]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "pypy3.7"]
         include:
         - os: ubuntu-latest
           os-name: Linux
@@ -28,12 +28,13 @@ jobs:
       - uses: actions/checkout@v2
       - uses: s-weigand/setup-conda@v1
         with:
+          conda-channels: conda-forge
           python-version: ${{ matrix.python-version }}
-        if: ${{ runner.os == 'Linux' && !contains(fromJSON(env.not_in_conda), matrix.python-version) }}
+        if: ${{ !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) }}
+        if: ${{ contains(fromJSON(env.not_in_conda), matrix.python-version) }}
       - name: Cache pip
         uses: actions/cache@v3
         with:
@@ -44,9 +45,10 @@ jobs:
       - name: Install dependencies
         run: |
           python --version
+          python -m ensurepip
           python -m pip install --upgrade pip setuptools wheel
           pip --version
-          pip install --upgrade virtualenv "tox < 4"
+          pip install --upgrade virtualenv "tox >= 3.15, < 4"
       - name: Set TOXENV
         run: |
           import os, sys