X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Frun-tests.yaml;h=a7e725866f217909572bbfe0623370a921308311;hb=2b2304b8b9c117129cfaf5d60b84cbcc0da9a60f;hp=4777a9fb4945dcf5e8c5d2f0f4949a8e6bfbd4b5;hpb=bc282b1800583b7eac6b46a56aad38138a3f0a84;p=sqlconvert.git

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index 4777a9f..a7e7258 100644
--- a/.github/workflows/run-tests.yaml
+++ b/.github/workflows/run-tests.yaml
@@ -4,6 +4,8 @@ on: [push, pull_request]
 
 jobs:
   run-tests:
+    env:
+      not_in_conda: "[]"
 
     strategy:
       matrix:
@@ -24,11 +26,11 @@ jobs:
 
       # Setup PostgreSQL
       - uses: ankane/setup-postgres@v1
-      - name: Setup Postgres user
+      - name: Setup Postgres user @ Linux
         run: |
           sudo -u postgres psql --command="ALTER USER runner CREATEDB PASSWORD 'test'"
         if: ${{ runner.os == 'Linux' }}
-      - name: Setup Postgres user
+      - name: Setup Postgres user @ w32
         run: |
           psql --command="CREATE USER runner CREATEDB PASSWORD 'test'"
         if: ${{ runner.os == 'Windows' }}
@@ -37,12 +39,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' && matrix.python-version != '3.11' }}
+        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' || matrix.python-version == '3.11' }}
+        if: ${{ contains(fromJSON(env.not_in_conda), matrix.python-version) }}
       - name: Cache pip
         uses: actions/cache@v3
         with:
@@ -53,9 +56,10 @@ jobs:
       - name: Install dependencies
         run: |
           python --version
+          python -m pip || python -m ensurepip --default-pip --upgrade
           python -m pip install --upgrade pip setuptools wheel
           pip --version
-          pip install --upgrade virtualenv tox
+          pip install --upgrade virtualenv "tox >= 3.15, < 4"
       - name: Set TOXENV
         run: |
           import os, sys