fix: cleanup tests and fix a raw string test, enable more win32

* split all runners into separate arch via matrix * macos does need macos-14 to get a proper arm64 build Signed-off-by: Stephen Arnold <[email protected]>
andreasvc · Sep 8, 2024 · e975b7c · e975b7c
1 parent 8fcfded
commit e975b7c
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 17 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,7 +13,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, windows-latest, macos-13]
+        include:
+        - os: "ubuntu-22.04"
+          arch: "x86_64"
+        - os: "ubuntu-22.04"
+          arch: "aarch64"
+        - os: "macos-13"
+          arch: "x86_64"
+          macosx_deployment_target: "13.0"
+        - os: "macos-14"
+          arch: "arm64"
+          macosx_deployment_target: "14.0"
+        - os: "windows-latest"
+          arch: "auto64"
+          triplet: "x64-windows"
+        - os: "windows-latest"
+          arch: "auto32"
+          triplet: "x86-windows"
 
     steps:
       - uses: actions/checkout@v4
@@ -36,10 +52,8 @@ jobs:
         env:
           # configure cibuildwheel to build native archs ('auto'), and some
           # emulated ones, plus cross-compile on macos
-          CIBW_ARCHS_LINUX: auto
-          CIBW_ARCHS_MACOS: auto arm64
+          CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_TEST_SKIP: "*_arm64 *universal2:arm64 *linux_i686"
-          CIBW_ARCHS_WINDOWS: auto64
           CIBW_MANYLINUX_X86_64_IMAGE: manylinux2014
           CIBW_MANYLINUX_I686_IMAGE: manylinux2010
           CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* cp312-*
@@ -48,18 +62,18 @@ jobs:
             yum -y update && yum -y install epel-release && yum install -y re2-devel ninja-build
           CIBW_BEFORE_ALL_MACOS: >
             brew install re2 pybind11
-          # macos target should be 10.14 to get c++17
-          CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=13.0
+          # macos target should be at least 10.13 to get full c++17
+          CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=${{ matrix.macosx_deployment_target }}
           CIBW_BEFORE_ALL_WINDOWS: >
-            vcpkg install pkgconf re2:x64-windows
+            vcpkg install pkgconf:${{ matrix.triplet }} re2:${{ matrix.triplet }}
             && vcpkg integrate install
           CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
           CIBW_TEST_REQUIRES: ""
           CIBW_TEST_COMMAND: ""
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
+          name: wheels-${{ matrix.os }}-${{ matrix.arch }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -88,7 +102,7 @@ jobs:
       run:
         shell: bash
     name: Check artifacts are correct
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/download-artifact@v4

diff --git a/tests/re_utils.py b/tests/re_utils.py
@@ -550,8 +550,9 @@
 
     # lookbehind: split by : but not if it is escaped by -.
     ('(?<!-):(.*?)(?<!-):', 'a:bc-:de:f', SUCCEED, 'g1', 'bc-:de' ),
-    # escaping with \ as we know it
-    (r'(?<!\\\):(.*?)(?<!\\\):', 'a:bc\\:de:f', SUCCEED, 'g1', 'bc\\:de' ),
+    # escaping with \ as we know it => updated for py311+
+    # by removing one backslash from each set of 3
+    (r'(?<!\\):(.*?)(?<!\\):', 'a:bc\\:de:f', SUCCEED, 'g1', 'bc\\:de' ),
     # terminating with ' and escaping with ? as in edifact
     ("(?<!\\?)'(.*?)(?<!\\?)'", "a'bc?'de'f", SUCCEED, 'g1', "bc?'de" ),
 

diff --git a/tests/test_re.py b/tests/test_re.py
@@ -1,14 +1,19 @@
 from __future__ import print_function
-try:
-    from test.test_support import verbose
-except ImportError:
-    from test.support import verbose
-import re2 as re
-from re import Scanner
+
 import os
 import sys
 import traceback
 from weakref import proxy
+
+import re2 as re
+from re import Scanner
+
+try:
+    from test import support
+    from test.support import verbose
+except ImportError:  # import error on Windows
+    verbose = re.VERBOSE
+
 if sys.version_info[0] > 2:
     unicode = str
     unichr = chr