Merge branch 'master' into simd

Author: andrewkern

.github/workflows/tests.yml

@@ -26,7 +26,7 @@ jobs:
           # (macos-10.15, macos-11, macos-12, and macos-13 were removed by GitHub)
           - { os: macos-14, python: 3.9 }
           # macOS, newest supported version
-          - { os: macos-15, python: 3.12 }
+          - { os: macos-26, python: 3.13 }
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -197,14 +197,16 @@ jobs:
           - { os: ubuntu-22.04, qt: 5.15.2, gcc: 12 }
           # Ubuntu 24.04 with the most recent Qt6 and GCC.
           - { os: ubuntu-22.04, qt: 6.8.2, gcc: 12 }
-          # old macOS with oldest supported Qt5; macos-12 and macos-13 were removed by GitHub,
-          # so we can't CI with Qt 5.x any more (no ARM64 builds available), oh well
-          #- {os: macos-12, qt: 5.9.5}
-          #- {os: macos-13, qt: 5.15.2}
-          # macOS ARM64 with Qt6
+          # macos-12 and macos-13 were removed by GitHub,
+          # so we can't CI with Qt 5.X on macOS any more, oh well
+          # old macOS with last official LTS Qt5
+          #- { os: macos-13, qt: 5.15.2 }
+          # old macOS ARM64 with older Qt6
           - { os: macos-14, qt: 6.7.3 }
-          # new macOS with most recent Qt6
-          - { os: macos-15, qt: 6.8.2 }
+          # macOS Intel with older Qt6
+          - { os: macos-15-intel, qt: 6.7.3 }
+          # new macOS with most recent Qt6 LTS; note Qt 6.8.4 or later is required here
+          - { os: macos-26, qt: 6.8.4 }
     runs-on: ${{ matrix.os }}
     env:
       CXXFLAGS: -D NO_QT_VERSION_ERROR

VERSIONS

@@ -21,6 +21,7 @@ development head (in the master branch):
 	fix #579, crash in models with (a) tree-seq recording, (b) multiple chromosomes, AND (c) rejection of proposed offspring in modifyChild()
 	add readLine() function for obtaining stdin input to running models, thanks to Chris Talbot
 	fix #580, add isClose() and allClose() Eidos functions for comparison within a given tolerance
+	shift to macOS 14 as the oldest supported macOS version in GitHub Actions; we no longer test on macOS 13, or with Qt 5.x on macOS (but Qt 5.x still gets tested on other platforms, for now)
 
 
 version 5.1 (Eidos version 4.1):