Upstream 4.13

.github/workflows/build_wheels_macos.yml

@@ -6,7 +6,7 @@ on:
       - 4.x
       - 5.x
     paths-ignore:
-      - '.github/workflows/build_wheels_linux*'
+      - '.github/workflows/build_wheels_manylinux*'
       - '.github/workflows/build_wheels_windows*'
       - '.github/workflows/build_wheels_macos_m1.yml'
   release:
@@ -18,10 +18,7 @@ on:
 
 jobs:
   Build:
-    runs-on: macos-13
-    defaults:
-      run:
-        shell: bash
+    runs-on: python-macos-intel
     strategy:
       fail-fast: false
       matrix:
@@ -31,6 +28,7 @@ jobs:
         without_gui: [0, 1]
         build_sdist: [0]
     env:
+      CI_BUILD: 1
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
       REPO_DIR: .
       PROJECT_SPEC: opencv-python
@@ -46,6 +44,7 @@ jobs:
       SDIST: ${{ matrix.build_sdist || 0 }}
       ENABLE_HEADLESS: ${{ matrix.without_gui }}
       ENABLE_CONTRIB: ${{ matrix.with_contrib }}
+      PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
@@ -55,34 +54,20 @@ jobs:
         if [[ "${{ github.event_name }}" == "schedule" || "${{ github.event_name }}" == "workflow_dispatch" ]]; then
           echo "ENABLE_ROLLING=1" >> $GITHUB_ENV
         fi
-        # hack for image issue on mac: https://github.com/actions/runner-images/issues/6817
-        rm /usr/local/bin/2to3*
-        rm /usr/local/bin/idle3*
-        rm /usr/local/bin/pydoc3*
-        rm /usr/local/bin/python3*
-        # end hack
     - name: Checkout
       uses: actions/checkout@v3
       with:
         submodules: false
         fetch-depth: 0
     - name: Build a package
       run: |
-        set -e
-        # Check out and prepare the source
-        # Multibuild doesn't have releases, so --depth would break eventually (see
-        # https://superuser.com/questions/1240216/server-does-not-allow-request-for-unadvertised)
         git submodule update --init multibuild
-        source multibuild/common_utils.sh
-        # https://github.com/matthew-brett/multibuild/issues/116
-        if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export ARCH_FLAGS=" "; fi
-        source multibuild/travis_steps.sh
-        # This sets -x
-        # source travis_multibuild_customize.sh
         echo $ENABLE_CONTRIB > contrib.enabled
         echo $ENABLE_HEADLESS > headless.enabled
-        set -x
-        build_wheel $REPO_DIR $PLAT
+        export MACOSX_DEPLOYMENT_TARGET=14.0
+        python${{ matrix.python-version }} -m pip install toml && python${{ matrix.python-version }} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${{ matrix.python-version }} -m pip install -r /dev/stdin
+        python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
+        delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
     - name: Saving a wheel accordingly to matrix
       uses: actions/upload-artifact@v4
       with:
@@ -91,14 +76,11 @@ jobs:
 
   Test:
     needs: [Build]
-    runs-on: macos-13
-    defaults:
-      run:
-        shell: bash
+    runs-on: python-macos-intel
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]
@@ -112,6 +94,7 @@ jobs:
       PLAT: x86_64
       OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
       PYLINT_TEST_FILE: ${{ github.workspace }}/opencv/samples/python/squares.py
+      PIP_INDEX_URL: https://pypi.tuna.tsinghua.edu.cn/simple
     steps:
     - name: Cleanup
       run: find . -mindepth 1 -delete
@@ -121,32 +104,33 @@ jobs:
       with:
         submodules: true
         fetch-depth: 0
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v4
-      with:
-        python-version: ${{ matrix.python-version }}
-        architecture: ${{ matrix.platform }}
-    - name: Setup Environment variables
-      run: if ["3.10" == "${{ matrix.python-version }}" -o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ matrix.python-version }}" -o "3.13" == "${{ matrix.python-version }}" ]; then echo "TEST_DEPENDS=$(echo $NP_TEST_DEP_LATEST)" >> $GITHUB_ENV; else echo "TEST_DEPENDS=$(echo $NP_TEST_DEP)" >> $GITHUB_ENV; fi
     - name: Download a wheel accordingly to matrix
       uses: actions/download-artifact@v4
       with:
         name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
         path: wheelhouse/
+    - name: Create Venv for test
+      run: |
+        test -d "${{ github.workspace }}/opencv_test" && rm -rf "${{ github.workspace }}/opencv_test"
+        python${{ matrix.python-version }} -m venv ${{ github.workspace }}/opencv_test
     - name: Package installation
       run: |
-        python -m pip install wheelhouse/opencv*.whl
+        source ${{ github.workspace }}/opencv_test/bin/activate
+        python${{ matrix.python-version }} -m pip install --upgrade pip
+        python${{ matrix.python-version }} -m pip install --no-cache --force-reinstall wheelhouse/opencv*.whl
         cd ${{ github.workspace }}/tests
-        python get_build_info.py
+        python${{ matrix.python-version }} get_build_info.py
     - name: Run tests
       run: |
+        source ${{ github.workspace }}/opencv_test/bin/activate
         cd ${{ github.workspace }}/opencv
-        python modules/python/test/test.py -v --repo .
+        python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
     - name: Pylint test
       run: |
-        python -m pip install pylint==2.15.9
+        source ${{ github.workspace }}/opencv_test/bin/activate
+        python${{ matrix.python-version }} -m pip install pylint==2.15.9
         cd ${{ github.workspace }}/tests
-        python -m pylint $PYLINT_TEST_FILE
+        python${{ matrix.python-version }} -m pylint $PYLINT_TEST_FILE
 
   Release_rolling:
     if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}

.github/workflows/build_wheels_macos_m1.yml

@@ -6,7 +6,7 @@ on:
       - 4.x
       - 5.x
     paths-ignore:
-      - '.github/workflows/build_wheels_linux*'
+      - '.github/workflows/build_wheels_manylinux*'
       - '.github/workflows/build_wheels_windows*'
       - '.github/workflows/build_wheels_macos.yml'
   release:
@@ -68,7 +68,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
+        python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
         platform: [x64]
         with_contrib: [0, 1]
         without_gui: [0, 1]