From eb49d9c0bc6825a623d5fb5507950c6d60df6bf0 Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Fri, 19 Jul 2024 12:55:50 +0100
Subject: [PATCH 1/2] Comment out failing build (due to Qt issues)

---
 .github/workflows/ci_workflows.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
index 496716b2..a2316ff0 100644
--- a/.github/workflows/ci_workflows.yml
+++ b/.github/workflows/ci_workflows.yml
@@ -55,7 +55,7 @@ jobs:
         # Test some configurations on Windows
         - windows: py38-test-pyqt514
         - windows: py39-test-pyqt515
-        - windows: py310-test-pyqt63
+        # - windows: py310-test-pyqt63
 
         - windows: py38-test-pyside515
         - windows: py310-test-pyside63

From a9a5e79218961845cce5530a46e941511bceb34a Mon Sep 17 00:00:00 2001
From: Thomas Robitaille <thomas.robitaille@gmail.com>
Date: Fri, 19 Jul 2024 13:18:39 +0100
Subject: [PATCH 2/2] Fix compatibility with Python 3.12

---
 echo/tests/test_selection.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/echo/tests/test_selection.py b/echo/tests/test_selection.py
index 7bb55243..9a079a44 100644
--- a/echo/tests/test_selection.py
+++ b/echo/tests/test_selection.py
@@ -98,13 +98,13 @@ def test_callbacks(self):
         self.state.add_callback('a', func)
 
         self.a.set_choices(self.state, [1, 2, 3])
-        assert func.called_once_with(1)
+        func.assert_called_with(1)
 
         self.state.a = 2
-        assert func.called_once_with(2)
+        func.assert_called_with(2)
 
         self.a.set_choices(self.state, [4, 5, 6])
-        assert func.called_once_with(4)
+        func.assert_called_with(4)
 
     def test_choice_separator(self):
 
@@ -128,7 +128,7 @@ def test_delay(self):
         with delay_callback(self.state, 'a'):
             self.a.set_choices(self.state, [4, 5, 6])
             assert func.call_count == 0
-        assert func.called_once_with(4)
+        func.assert_called_once_with(4)
         func.reset_mock()
 
         # Check that the callback gets called even if only the choices
@@ -136,5 +136,5 @@ def test_delay(self):
         with delay_callback(self.state, 'a'):
             self.a.set_choices(self.state, [1, 2, 4])
             assert func.call_count == 0
-        assert func.called_once_with(4)
+        func.assert_called_once_with(4)
         func.reset_mock()