X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.github%2Fworkflows%2Frun-tests.yaml;h=25c08a0219e4193f755c36bb8320baf4a34309eb;hb=HEAD;hp=fc4d9a76c2570a8fc597c2a64af64a01b8c58d0d;hpb=eabdc0827ee1bb4a5a549d8cef6e1b62e654471d;p=sqlconvert.git

diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
index fc4d9a7..25c08a0 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: "[]"
 
     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"]
+        python-version: ["2.7", "3.5", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
         include:
         - os: ubuntu-latest
           os-name: Linux
@@ -24,25 +26,26 @@ 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' }}
 
       # Setup Python/pip
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - 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 < 4"
+          pip install --upgrade virtualenv "tox >= 3.15, < 4"
       - name: Set TOXENV
         run: |
           import os, sys