From a6a3aec58935259c5f8e80c5c6388805cf73281c Mon Sep 17 00:00:00 2001
From: Corran Webster <cwebster@enthought.com>
Date: Tue, 16 May 2023 14:40:54 +0100
Subject: [PATCH] Use Python 3.8 for tests from source (#898)

* Use Python 3.8 for tests from source.

* Use Pyside6 for the tests on Python 3.8
---
 .github/workflows/ets-from-source.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml
index dd4dfe2b8..acb3e7cef 100644
--- a/.github/workflows/ets-from-source.yml
+++ b/.github/workflows/ets-from-source.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        toolkit: ['null', 'pyqt5', 'pyside2']
+        toolkit: ['null', 'pyside6']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -36,18 +36,18 @@ jobs:
       - name: Install click to the default EDM environment
         run: edm install -y wheel click coverage
       - name: Install test environment
-        run: edm run -- python ci/edmtool.py install --toolkit=${{ matrix.toolkit }} --source
+        run: edm run -- python ci/edmtool.py install --runtime=3.8 --toolkit=${{ matrix.toolkit }} --source
       - name: Run tests
         # kiva agg requires at least 15-bit color depth.
         # The --server-args assumes xvfb-run is called, hence Linux only.
-        run: xvfb-run -a --server-args="-screen 0 1024x768x24" edm run -- python ci/edmtool.py test --toolkit=${{ matrix.toolkit }}
+        run: xvfb-run -a --server-args="-screen 0 1024x768x24" edm run -- python ci/edmtool.py test --runtime=3.8 --toolkit=${{ matrix.toolkit }}
 
 # Test against EDM packages from source on Windows and OSX
   test-ets-source:
     strategy:
       matrix:
         os: [windows-latest]
-        toolkit: ['null', 'pyqt5', 'pyside2']
+        toolkit: ['null', 'pyside6']
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -63,9 +63,9 @@ jobs:
       - name: Install click to the default EDM environment
         run: edm install -y wheel click coverage
       - name: Install test environment
-        run: edm run -- python ci/edmtool.py install --toolkit=${{ matrix.toolkit }} --source
+        run: edm run -- python ci/edmtool.py install --runtime=3.8 --toolkit=${{ matrix.toolkit }} --source
       - name: Run tests
-        run: edm run -- python ci/edmtool.py test --toolkit=${{ matrix.toolkit }}
+        run: edm run -- python ci/edmtool.py test --runtime=3.8 --toolkit=${{ matrix.toolkit }}
 
   notify-on-failure:
     needs: [test-ets-source-linux, test-ets-source]