From bd8e27cccfd80a73e7c144d8855f863ac20f4c7e Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Tue, 30 Apr 2024 14:42:48 +0100
Subject: [PATCH 1/2] Remove Pyside as a test dependency - it should no longer
 be needed

---
 .github/workflows/run-traits-tests.yml | 27 +++-----------------------
 setup.py                               |  1 -
 2 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/run-traits-tests.yml b/.github/workflows/run-traits-tests.yml
index cc1bb81be..ecccb2a5f 100644
--- a/.github/workflows/run-traits-tests.yml
+++ b/.github/workflows/run-traits-tests.yml
@@ -4,11 +4,6 @@ on:
 - pull_request
 - workflow_dispatch
 
-env:
-  # Temporary workaround prior to release of TraitsUI 8.0
-  # xref: enthought/traits#1742
-  ETS_QT4_IMPORTS: 1
-
 jobs:
   tests:
     strategy:
@@ -20,19 +15,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-    - name: Install Linux packages for Qt support
-      run: |
-        sudo apt-get update
-        sudo apt-get install libegl1
-        sudo apt-get install libxkbcommon-x11-0
-        sudo apt-get install libxcb-cursor0
-        sudo apt-get install libxcb-icccm4
-        sudo apt-get install libxcb-image0
-        sudo apt-get install libxcb-keysyms1
-        sudo apt-get install libxcb-randr0
-        sudo apt-get install libxcb-render-util0
-        sudo apt-get install libxcb-shape0
-      if: matrix.os == 'ubuntu-latest'
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v5
       with:
@@ -44,9 +26,6 @@ jobs:
     - name: Create clean test directory
       run: |
         mkdir testdir
-    - name: Test Traits package (Linux)
-      run: cd testdir && xvfb-run -a python -m unittest discover -v traits
-      if: matrix.os == 'ubuntu-latest'
-    - name: Test Traits package (Windows/macOS)
-      run: cd testdir && python -m unittest discover -v traits
-      if: matrix.os != 'ubuntu-latest'
+    - name: Test Traits package
+      run: python -m unittest discover -v traits
+      working-directory: testdir
diff --git a/setup.py b/setup.py
index 52172096c..539d36f6b 100644
--- a/setup.py
+++ b/setup.py
@@ -310,7 +310,6 @@ def get_long_description():
             "mypy",
             "numpy",
             "pyface",
-            "PySide6",
             "setuptools",
             "Sphinx>=2.1.0",
             "traitsui",

From e4d0cff1885afd32667169d4563e2210ad8b8054 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Tue, 30 Apr 2024 14:45:27 +0100
Subject: [PATCH 2/2] Also remove pyside6 from the list of dependencies in
 etstool.py

---
 etstool.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/etstool.py b/etstool.py
index 76b7917ff..3b193f096 100644
--- a/etstool.py
+++ b/etstool.py
@@ -96,7 +96,6 @@
     "lark-parser",
     "mypy",
     "numpy",
-    "pyside6",
     "Sphinx",
     "sphinx_copybutton",
     "traitsui",