Merge branch 'main' into add-greybox

Author: mrmundt

.github/workflows/test_branches.yml

@@ -352,10 +352,6 @@ jobs:
         if test "${{matrix.TARGET}}" == linux; then
             EXCLUDE="casadi numdifftools $EXCLUDE"
         fi
-        if [[ "${{matrix.TARGET}}" == win && "${{matrix.python}}" == 3.13* ]]; then
-            # As of Nov 7, 2024, qtconsole is not compatible with python 3.13 on win
-            EXCLUDE="qtconsole $EXCLUDE"
-        fi
         EXCLUDE=`echo "$EXCLUDE" | xargs`
         if test -n "$EXCLUDE"; then
             for WORD in $EXCLUDE; do

.github/workflows/test_pr_and_main.yml

@@ -97,6 +97,11 @@ jobs:
         other: [""]
         category: [""]
 
+        # HACK: Avoid 3.13.7 on Windows. We exclude this originally...
+        exclude:
+        - os: windows-latest
+          python: 3.13
+
         include:
         - os: ubuntu-latest
           test_docs: 1
@@ -114,6 +119,15 @@ jobs:
           PYENV: conda
           PACKAGES: glpk pytest-qt filelock
 
+        # Now manually add 3.13.5 back in. Ergo, all other OS' will
+        # run 3.13.7, but windows, the problem child, will not
+        - os: windows-latest
+          python: '3.13.5'
+          test_docs: 1
+          TARGET: win
+          PYENV: conda
+          PACKAGES: glpk pytest-qt filelock
+
         - os: ubuntu-latest
           python: 3.11
           other: /conda
@@ -404,10 +418,6 @@ jobs:
         if test "${{matrix.TARGET}}" == linux; then
             EXCLUDE="casadi numdifftools $EXCLUDE"
         fi
-        if [[ "${{matrix.TARGET}}" == win && "${{matrix.python}}" == 3.13* ]]; then
-            # As of Nov 7, 2024, qtconsole is not compatible with python 3.13 on win
-            EXCLUDE="qtconsole $EXCLUDE"
-        fi
         EXCLUDE=`echo "$EXCLUDE" | xargs`
         if test -n "$EXCLUDE"; then
             for WORD in $EXCLUDE; do