1.7.1dev: merge [17918:17919] from 1.6-stable (fix for GHA)

git-svn-id: http://trac.edgewall.org/intertrac/log:/trunk@17920 af82e41b-90c4-0310-8c96-b1721e28e2e2

Author: jomae

.github/svn-expat272.patch

@@ -0,0 +1,21 @@
+Index: build/generator/gen_win_dependencies.py
+===================================================================
+--- build/generator/gen_win_dependencies.py	(revision 1929107)
++++ build/generator/gen_win_dependencies.py	(working copy)
+@@ -580,13 +580,13 @@
+ 
+     txt = open(version_file_path).read()
+ 
+-    vermatch = re.search(r'^\s*#define\s+XML_MAJOR_VERSION\s+(\d+)', txt, re.M)
++    vermatch = re.search(r'^\s*#\s*define\s+XML_MAJOR_VERSION\s+(\d+)', txt, re.M)
+     major = int(vermatch.group(1))
+ 
+-    vermatch = re.search(r'^\s*#define\s+XML_MINOR_VERSION\s+(\d+)', txt, re.M)
++    vermatch = re.search(r'^\s*#\s*define\s+XML_MINOR_VERSION\s+(\d+)', txt, re.M)
+     minor = int(vermatch.group(1))
+ 
+-    vermatch = re.search(r'^\s*#define\s+XML_MICRO_VERSION\s+(\d+)', txt, re.M)
++    vermatch = re.search(r'^\s*#\s*define\s+XML_MICRO_VERSION\s+(\d+)', txt, re.M)
+     patch = int(vermatch.group(1))
+ 
+     # apr-Util 0.9-1.4 compiled expat to 'xml.lib', but apr-util 1.5 switched

.github/windows-prepare.ps1

@@ -75,9 +75,7 @@ if (-not (Verify-Binary)) {
     Expand-Archive -LiteralPath $svnarc -DestinationPath "$workspace"
     Expand-Archive -LiteralPath $sqlite_arc -DestinationPath "$workspace"
     Set-Location -LiteralPath "$workspace\subversion-$svnver"
-    & git apply -v -p0 --whitespace=fix `
-                "$workspace\.github\svn-swig41.patch" `
-                "$workspace\.github\svn-py312.patch"
+    & git apply -v -p0 --whitespace=fix "$workspace\.github\svn-expat272.patch"
     & $python gen-make.py --release `
                           --vsnet-version=2019 `
                           "--with-apr=$vcpkg_dir" `

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         os:  [ubuntu-24.04, macos-14]
-        python-version: ['3.13']
+        python-version: ['3.14']
         tests: [functional]
 
     env:
@@ -74,22 +74,23 @@ jobs:
       fail-fast: false
       matrix:
         include:
-        - {os: ubuntu-24.04, python-version: '3.13', tracdb: sqlite,     tests: functional}
-        - {os: ubuntu-24.04, python-version: '3.13', tracdb: postgresql, tests: functional}
-        - {os: ubuntu-24.04, python-version: '3.13', tracdb: mysql,      tests: functional}
+        - {os: ubuntu-24.04, python-version: '3.14', tracdb: sqlite,     tests: functional}
+        - {os: ubuntu-24.04, python-version: '3.14', tracdb: postgresql, tests: functional}
+        - {os: ubuntu-24.04, python-version: '3.14', tracdb: mysql,      tests: functional}
+        - {os: ubuntu-24.04, python-version: '3.14', tracdb: ''}
         - {os: ubuntu-24.04, python-version: '3.13', tracdb: ''}
         - {os: ubuntu-24.04, python-version: '3.12', tracdb: ''}
         - {os: ubuntu-24.04, python-version: '3.11', tracdb: ''}
         - {os: ubuntu-24.04, python-version: '3.10', tracdb: ''}
         - {os: ubuntu-24.04, python-version: '3.9',  tracdb: ''}
         - {os: ubuntu-24.04, python-version: '3.8',  tracdb: ''}
         - {os: ubuntu-22.04, python-version: '3.7',  tracdb: ''}
-        - {os: macos-14,     python-version: '3.13', tracdb: sqlite,     tests: functional}
-        - {os: macos-14,     python-version: '3.13', tracdb: postgresql}
-        - {os: macos-14,     python-version: '3.13', tracdb: mysql}
+        - {os: macos-14,     python-version: '3.14', tracdb: sqlite,     tests: functional}
+        - {os: macos-14,     python-version: '3.14', tracdb: postgresql}
+        - {os: macos-14,     python-version: '3.14', tracdb: mysql}
+        - {os: macos-14,     python-version: '3.14', tracdb: ''}
         - {os: macos-14,     python-version: '3.13', tracdb: ''}
         - {os: macos-14,     python-version: '3.12', tracdb: ''}
-        - {os: macos-14,     python-version: '3.11', tracdb: ''}
 
     env:
       MATRIX_OS: ${{ matrix.os }}
@@ -147,16 +148,17 @@ jobs:
       fail-fast: false
       matrix:
         include:
+        - {os: ubuntu-24.04, python-version: '3.14'}
         - {os: ubuntu-24.04, python-version: '3.13'}
         - {os: ubuntu-24.04, python-version: '3.12'}
         - {os: ubuntu-24.04, python-version: '3.11'}
         - {os: ubuntu-24.04, python-version: '3.10'}
         - {os: ubuntu-24.04, python-version: '3.9'}
         - {os: ubuntu-24.04, python-version: '3.8'}
         - {os: ubuntu-22.04, python-version: '3.7'}
+        - {os: macos-14,     python-version: '3.14'}
         - {os: macos-14,     python-version: '3.13'}
         - {os: macos-14,     python-version: '3.12'}
-        - {os: macos-14,     python-version: '3.11'}
 
     env:
       MATRIX_OS: ${{ matrix.os }}
@@ -211,7 +213,7 @@ jobs:
       matrix:
         os: [windows-2022]
         architecture: [x64]
-        python-version: ['3.12']
+        python-version: ['3.14']
         tests: [functional]
 
     env:
@@ -264,7 +266,7 @@ jobs:
       matrix:
         os: [windows-2022]
         architecture: [x64]
-        python-version: ['3.12']
+        python-version: ['3.14']
         subversion-version: ['1.14.5']
         tracdb: ['', sqlite, postgresql, mysql]
         include:
@@ -330,7 +332,7 @@ jobs:
       matrix:
         os: [windows-2022]
         architecture: [x64]
-        python-version: ['3.12']
+        python-version: ['3.14']
         subversion-version: ['1.14.5']
 
     env:
@@ -412,7 +414,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-24.04]
-        python-version: ['3.13']
+        python-version: ['3.14']
 
     needs: [posix-test-minimum, posix-test, windows-test-minimum, windows-test]