From a2a7ede9a023426fbb568bd62467180beab781ea Mon Sep 17 00:00:00 2001
From: Dmitry Maslennikov <mrdaimor@gmail.com>
Date: Sat, 6 Jul 2024 23:56:25 +1000
Subject: [PATCH] more fixed

---
 .github/workflows/main.yml            | 30 ++++++++++++++++-----------
 tests/functional/projects/__init__.py |  6 +++---
 tox.ini                               |  4 ++--
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6b306bd..0d0385b 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -76,6 +76,21 @@ jobs:
         run: pre-commit run --all-files --show-diff-on-failure
 
   test-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        image:
+          - containers.intersystems.com/intersystems/iris-community:latest-em
+          - containers.intersystems.com/intersystems/iris-community:latest-preview
+        python:
+          - name: py38
+            version: "3.8"
+          - name: py39
+            version: "3.9"
+          - name: py310
+            version: "3.10"
+          - name: py311
+            version: "3.11"
     runs-on: ubuntu-latest
 
     steps:
@@ -83,23 +98,14 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: |
-            3.8
-            3.9
-            3.10
-            3.11
+          python-version: ${{ matrix.python.version }}
       - name: install dependencies
         run: |
           pip install tox
-      - name: Build Docker image
-        run: docker build -t dbt-iris:$GITHUB_SHA .
-      - name: Run Container
-        run: |
-          docker run --rm -d -p 1972:1972 dbt-iris:$GITHUB_SHA \
-          -a 'iris session iris -U %SYS "##class(Security.Users).UnExpireUserPasswords(\"*\")"'
+      - run: docker pull ${{ matrix.image }}
       - name: Run Tests
         run: |
-          tox -e py38-iris,py39-iris,py310-iris,py311-iris -- --container containers.intersystems.com/intersystems/iris-community:latest
+          tox -e ${{ matrix.python.name }}-iris -- --container ${{ matrix.image }}
 
   build:
     needs:
diff --git a/tests/functional/projects/__init__.py b/tests/functional/projects/__init__.py
index 2ac8bfc..a058d56 100644
--- a/tests/functional/projects/__init__.py
+++ b/tests/functional/projects/__init__.py
@@ -1,3 +1,3 @@
-from tests.functional.projects.dbt_integration import dbt_integration
-from tests.functional.projects.graph_selection import GraphSelection
-from tests.functional.projects.jaffle_shop import JaffleShop
+from tests.functional.projects.dbt_integration import dbt_integration  # noqa
+from tests.functional.projects.graph_selection import GraphSelection  # noqa
+from tests.functional.projects.jaffle_shop import JaffleShop  # noqa
diff --git a/tox.ini b/tox.ini
index 0b94d0a..7488aba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = True
-envlist = py3{7,8,9,10}{-iris,}
+envlist = py3{8,9,10,11}{-iris,}
 
 [testenv:{py37,py38,py39,py310}]
 description = unit testing
@@ -12,7 +12,7 @@ deps =
   -r requirements-dev.txt
   -e.
 
-[testenv:py3{7,8,9,10}-iris]
+[testenv:py3{8,9,10,11}-iris]
 description = adapter plugin functional testing
 skip_install = true
 passenv = DBT_*,IRIS_TEST_*,PYTEST_ADOPTS