From d32be096040695d2f91a14d5b853ebc302a078a2 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 5 Dec 2023 09:43:20 +0100
Subject: test: Remove Python2 specific tests

---
 test/CMakeLists.txt               | 10 +---------
 test/baseline/feat-value_py.test  | 23 +++++++++++++++++++++++
 test/baseline/feat-value_py2.test | 23 -----------------------
 test/baseline/feat-value_py3.test | 23 -----------------------
 4 files changed, 24 insertions(+), 55 deletions(-)
 create mode 100644 test/baseline/feat-value_py.test
 delete mode 100644 test/baseline/feat-value_py2.test
 delete mode 100644 test/baseline/feat-value_py3.test

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 301959db..30ee993f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,15 +19,7 @@ macro(add_ledger_harness_tests _class)
     file(GLOB ${_class}_TESTS *.test)
     foreach(TestFile ${${_class}_TESTS})
       get_filename_component(TestFile_Name ${TestFile} NAME_WE)
-      string(FIND ${TestFile_Name} "_py" TestFile_IsPythonTest)
-      if ((TestFile_IsPythonTest GREATER -1))
-        get_filename_component(TestFile_FullName ${TestFile} NAME)
-        string(FIND ${TestFile_FullName} "_py.test" TestFile_IsAnyPythonTest)
-        string(FIND ${TestFile_FullName} "_py${Python_VERSION_MAJOR}.test" TestFile_IsThisPythonTest)
-        if ((TestFile_IsAnyPythonTest EQUAL -1) AND (TestFile_IsThisPythonTest EQUAL -1))
-          continue()
-        endif()
-      endif()
+      string(FIND ${TestFile_Name} "_py.test" TestFile_IsPythonTest)
       if ((TestFile_IsPythonTest EQUAL -1) OR HAVE_BOOST_PYTHON)
         add_test(NAME ${_class}Test_${TestFile_Name}
           COMMAND ${Python_EXECUTABLE} ${PROJECT_SOURCE_DIR}/test/RegressTests.py
diff --git a/test/baseline/feat-value_py.test b/test/baseline/feat-value_py.test
new file mode 100644
index 00000000..f82fbf2b
--- /dev/null
+++ b/test/baseline/feat-value_py.test
@@ -0,0 +1,23 @@
+python
+    def print_type(val):
+        print(type(val), val)
+
+eval print_type(true)
+eval print_type([2010/08/10])
+eval print_type(10)
+eval print_type($10.00)
+eval print_type($10.00 + CAD 30)
+eval print_type("Hello!")
+eval print_type(/Hello!/)
+;eval print_type((1, 2, 3))
+
+test reg
+<class 'bool'> True
+<class 'datetime.date'> 2010-08-10
+<class 'ledger.Amount'> 10
+<class 'ledger.Amount'> $10.00
+<class 'ledger.Balance'> $10.00
+CAD 30
+<class 'str'> Hello!
+<class 'ledger.Value'> Hello!
+end test
diff --git a/test/baseline/feat-value_py2.test b/test/baseline/feat-value_py2.test
deleted file mode 100644
index 4378c91a..00000000
--- a/test/baseline/feat-value_py2.test
+++ /dev/null
@@ -1,23 +0,0 @@
-python
-    def print_type(val):
-        print(type(val), val)
-
-eval print_type(true)
-eval print_type([2010/08/10])
-eval print_type(10)
-eval print_type($10.00)
-eval print_type($10.00 + CAD 30)
-eval print_type("Hello!")
-eval print_type(/Hello!/)
-;eval print_type((1, 2, 3))
-
-test reg
-<type 'bool'> True
-<type 'datetime.date'> 2010-08-10
-<class 'ledger.Amount'> 10
-<class 'ledger.Amount'> $10.00
-<class 'ledger.Balance'> $10.00
-CAD 30
-<type 'unicode'> Hello!
-<class 'ledger.Value'> Hello!
-end test
diff --git a/test/baseline/feat-value_py3.test b/test/baseline/feat-value_py3.test
deleted file mode 100644
index f82fbf2b..00000000
--- a/test/baseline/feat-value_py3.test
+++ /dev/null
@@ -1,23 +0,0 @@
-python
-    def print_type(val):
-        print(type(val), val)
-
-eval print_type(true)
-eval print_type([2010/08/10])
-eval print_type(10)
-eval print_type($10.00)
-eval print_type($10.00 + CAD 30)
-eval print_type("Hello!")
-eval print_type(/Hello!/)
-;eval print_type((1, 2, 3))
-
-test reg
-<class 'bool'> True
-<class 'datetime.date'> 2010-08-10
-<class 'ledger.Amount'> 10
-<class 'ledger.Amount'> $10.00
-<class 'ledger.Balance'> $10.00
-CAD 30
-<class 'str'> Hello!
-<class 'ledger.Value'> Hello!
-end test
-- 
cgit v1.2.3


From cf8fd54ebb5b043e20044224d3f2ad6ddc896e2f Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 5 Dec 2023 13:10:05 +0100
Subject: chore: Install icu4c for tests and force install of dependencies

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

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 62674d77..8d3456ad 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -53,7 +53,7 @@ jobs:
           brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
 
           brew update
-          brew install boost boost-python3 gmp mpfr gpgme
+          brew install --force --overwrite boost boost-python3 gmp mpfr icu4c gpgme
 
       - name: Configure CMake
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-- 
cgit v1.2.3