From 813465e06552695508530b83eedbd5805577cc3a Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 24 Apr 2024 12:08:11 +0100
Subject: [PATCH 1/4] Use earlier macOS for earlier Python versions

---
 .github/workflows/run-traits-tests.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/.github/workflows/run-traits-tests.yml b/.github/workflows/run-traits-tests.yml
index cc1bb81be..1fd520bb3 100644
--- a/.github/workflows/run-traits-tests.yml
+++ b/.github/workflows/run-traits-tests.yml
@@ -15,6 +15,20 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
+        # Python 3.8 and 3.9 are no longer available on macos-latest, so
+        # use an earlier version.
+        # xref: https://github.com/actions/setup-python/issues/850
+        exclude:
+          - python-version: "3.8"
+            os: "macos-latest"
+          - python-version: "3.9"
+            os: "macos-latest"
+        include:
+          - python-version: "3.8"
+            os: "macos-13"
+          - python-version: "3.9"
+            os: "macos-13"
+
 
     runs-on: ${{ matrix.os }}
 

From e0cf2b778463ad9fc47e77bbe3d61eb3641c9212 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 24 Apr 2024 12:10:26 +0100
Subject: [PATCH 2/4] Remove bonus blank line

---
 .github/workflows/run-traits-tests.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/run-traits-tests.yml b/.github/workflows/run-traits-tests.yml
index 1fd520bb3..69489b55b 100644
--- a/.github/workflows/run-traits-tests.yml
+++ b/.github/workflows/run-traits-tests.yml
@@ -29,7 +29,6 @@ jobs:
           - python-version: "3.9"
             os: "macos-13"
 
-
     runs-on: ${{ matrix.os }}
 
     steps:

From f08a87ad2440e71813bc63e4f5854e0d61d591ef Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 24 Apr 2024 14:11:53 +0100
Subject: [PATCH 3/4] Add a workaround for a test that's segfaulting with
 PySide 6.7.0

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 0898a7b95..79969281e 100644
--- a/setup.py
+++ b/setup.py
@@ -307,7 +307,9 @@ def get_long_description():
             "mypy",
             "numpy",
             "pyface",
-            "PySide6",
+            # TraitsUI is currently broken with PySide 6.7.0
+            # xref: https://github.com/enthought/traitsui/issues/2045
+            "PySide6<6.7",
             "setuptools",
             "Sphinx>=2.1.0",
             "traitsui",

From 6945ea83ed8522386b22bd4bef00faa53d3bd439 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Wed, 24 Apr 2024 14:34:51 +0100
Subject: [PATCH 4/4] Add defusedxml to test dependencies

---
 setup.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/setup.py b/setup.py
index 79969281e..26a80f543 100644
--- a/setup.py
+++ b/setup.py
@@ -302,6 +302,9 @@ def get_long_description():
         ],
         "test": [
             "Cython",
+            # defusedxml is required by the Sphinx test machinery
+            # for recent versions of Sphinx (including 7.3.7)
+            "defusedxml",
             "flake8",
             "flake8-ets",
             "mypy",