diff --git a/.github/workflows/build_wheels_linux.yml b/.github/workflows/build_wheels_linux.yml
index 7ff34a18..bd42944c 100644
--- a/.github/workflows/build_wheels_linux.yml
+++ b/.github/workflows/build_wheels_linux.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
- python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ python-version: ['3.6']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
@@ -37,13 +37,12 @@ jobs:
MB_PYTHON_VERSION: ${{ matrix.python-version }}
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
MB_ML_VER: 2014
- NP_TEST_DEP: numpy==1.19.4
- NP_TEST_DEP_LATEST: numpy==1.21.2
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
+ PLAT: x86_64
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
@@ -59,25 +58,64 @@ jobs:
if: github.event_name == 'pull_request'
run: git submodule update --remote
- - name: Setup Environment variables
- run: |
- if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
- if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
- if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
- if [ "3.10" == "${{ 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: build
+ - name: Build a package
run: source scripts/build.sh
- - name: install and test
- run: source scripts/install.sh
-
- - name: saving artifacts
+ - name: Saving all wheels
uses: actions/upload-artifact@v2
with:
name: wheels
path: wheelhouse/opencv*.whl
+ - name: Saving a wheel accordingly to matrix
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/opencv*.whl
+
+ test:
+ needs: [build]
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: bash
+
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ubuntu-latest]
+ python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ platform: [x64]
+ with_contrib: [0, 1]
+ without_gui: [0, 1]
+ build_sdist: [0]
+
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+ MB_PYTHON_VERSION: ${{ matrix.python-version }}
+ NP_TEST_DEP: numpy==1.19.4
+ NP_TEST_DEP_LATEST: numpy==1.21.2
+ CONFIG_PATH: travis_config.sh
+ PLAT: x86_64
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ submodules: false
+ fetch-depth: 0
+
+ - name: Setup Environment variables
+ run: if [ "3.10" == "${{ 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@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/
+
+ - name: Package installation and run tests
+ run: source scripts/install.sh
build_sdist:
runs-on: ${{ matrix.os }}
@@ -131,12 +169,7 @@ jobs:
python-version: ${{ matrix.python-version }}
architecture: ${{ matrix.platform }}
- - name: Setup Environment variables
- run: |
- if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
- if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
-
- - name: before install
+ - name: Build a package
run: |
set -e
# Build and package
@@ -157,7 +190,7 @@ jobs:
test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
- needs: [build, build_sdist]
+ needs: [build, build_sdist, test]
runs-on: ubuntu-latest
environment: test-opencv-python-release
defaults:
@@ -176,7 +209,7 @@ jobs:
release_opencv_python:
if: github.event_name == 'release' && !github.event.release.prerelease
- needs: [build, build_sdist]
+ needs: [build, build_sdist, test]
runs-on: ubuntu-latest
environment: opencv-python-release
defaults:
diff --git a/.github/workflows/build_wheels_linux_arm.yml b/.github/workflows/build_wheels_linux_arm.yml
index 89142a57..a97bbc29 100644
--- a/.github/workflows/build_wheels_linux_arm.yml
+++ b/.github/workflows/build_wheels_linux_arm.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [ARM64]
- python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ python-version: ['3.6']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
@@ -38,12 +38,9 @@ jobs:
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
PLAT: aarch64
MB_ML_VER: 2014
- NP_TEST_DEP: numpy==1.19.4
- NP_TEST_DEP_LATEST: numpy==1.21.2
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
- DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
USE_CCACHE: 0
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
@@ -61,26 +58,74 @@ jobs:
submodules: false
fetch-depth: 0
- - name: Setup Environment variables
- run: |
- if [ "ARM64" == "${{ matrix.os }}" ]; then echo "PLAT=aarch64" >> $GITHUB_ENV; fi
- if [ "3.10" == "${{ 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: build
+ - name: Build a package
run: source scripts/build.sh
- - name: install and test
- run: source scripts/install.sh
-
- - name: saving artifacts
+ - name: Saving all wheels
uses: actions/upload-artifact@v2
with:
name: wheels
path: wheelhouse/opencv*.whl
+ - name: Saving a wheel accordingly to matrix
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/opencv*.whl
+
+ test:
+ needs: [build_arm]
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: bash
+
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ARM64]
+ python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ platform: [x64]
+ with_contrib: [0, 1]
+ without_gui: [0, 1]
+ build_sdist: [0]
+
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+ MB_PYTHON_VERSION: ${{ matrix.python-version }}
+ PLAT: aarch64
+ NP_TEST_DEP: numpy==1.19.4
+ NP_TEST_DEP_LATEST: numpy==1.21.4
+ CONFIG_PATH: travis_config.sh
+ DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
+ UNICODE_WIDTH: 32
+
+ steps:
+ - name: Cleanup
+ if: always()
+ uses: AutoModality/action-clean@v1
+
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ submodules: true
+ fetch-depth: 0
+
+ - name: Setup Environment variables
+ run: if [ "3.10" == "${{ 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@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/
+
+ - name: Package installation and run tests
+ run: source scripts/install.sh
+
test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
- needs: [build_arm]
+ needs: [build_arm, test]
runs-on: ubuntu-latest
environment: test-opencv-python-release
defaults:
@@ -99,7 +144,7 @@ jobs:
release_opencv_python:
if: github.event_name == 'release' && !github.event.release.prerelease
- needs: [build_arm]
+ needs: [build_arm, test]
runs-on: ubuntu-latest
environment: opencv-python-release
defaults:
diff --git a/.github/workflows/build_wheels_macos.yml b/.github/workflows/build_wheels_macos.yml
index d4f10be0..87fe6f99 100644
--- a/.github/workflows/build_wheels_macos.yml
+++ b/.github/workflows/build_wheels_macos.yml
@@ -23,7 +23,7 @@ jobs:
fail-fast: false
matrix:
os: [macos-10.15, macos-11]
- python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ python-version: ['3.6']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
@@ -48,14 +48,13 @@ jobs:
MB_PYTHON_VERSION: ${{ matrix.python-version }}
TRAVIS_PYTHON_VERSION: ${{ matrix.python-version }}
MB_ML_VER: 2014
- NP_TEST_DEP: numpy==1.19.4
- NP_TEST_DEP_LATEST: numpy==1.21.2
TRAVIS_BUILD_DIR: ${{ github.workspace }}
TRAVIS_OS_NAME: osx
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/asenyaev/manylinux2014_${PLAT}
USE_CCACHE: 1
UNICODE_WIDTH: 32
+ PLAT: x86_64
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
@@ -71,15 +70,7 @@ jobs:
if: github.event_name == 'pull_request'
run: git submodule update --remote
- - name: Setup Environment variables
- run: |
- if [ "schedule" == "${{ github.event_name }}" ]; then echo "TRAVIS_EVENT_TYPE=cron" >> $GITHUB_ENV; else echo "TRAVIS_EVENT_TYPE=${{ github.event_name }}" >> $GITHUB_ENV; fi
- if [ "schedule" == "${{ github.event_name }}" ]; then echo "BUILD_COMMIT=master" >> $GITHUB_ENV; else echo "BUILD_COMMIT=$BUILD_COMMIT" >> $GITHUB_ENV; fi
- if [ "x64" == "${{ matrix.platform }}" ]; then echo "PLAT=x86_64" >> $GITHUB_ENV; fi
- if [ "x86" == "${{ matrix.platform }}" ]; then echo "PLAT=i686" >> $GITHUB_ENV; fi
- if [ "3.10" == "${{ 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: before install
+ - name: Build a package
run: |
set -e
# Check out and prepare the source
@@ -96,19 +87,92 @@ jobs:
echo $ENABLE_HEADLESS > headless.enabled
set -x
build_wheel $REPO_DIR $PLAT
- git submodule update --init --recursive
- install_run $PLAT
- set +x
- - name: saving artifacts
+ - name: Saving all wheels
uses: actions/upload-artifact@v2
with:
name: wheels
path: wheelhouse/opencv*.whl
+ - name: Saving a wheel accordingly to matrix
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/opencv*.whl
+
+ test:
+ needs: [build]
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: bash
+
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [macos-10.15, macos-11]
+ python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ platform: [x64]
+ with_contrib: [0, 1]
+ without_gui: [0, 1]
+ build_sdist: [0]
+ exclude:
+ - os: macos-10.15
+ python-version: '3.10'
+ - os: macos-11
+ python-version: '3.6'
+ - os: macos-11
+ python-version: '3.7'
+ - os: macos-11
+ python-version: '3.8'
+ - os: macos-11
+ python-version: '3.9'
+
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+ MB_PYTHON_VERSION: ${{ matrix.python-version }}
+ NP_TEST_DEP: numpy==1.19.4
+ NP_TEST_DEP_LATEST: numpy==1.21.4
+ CONFIG_PATH: travis_config.sh
+ PLAT: x86_64
+ OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ submodules: true
+ fetch-depth: 0
+
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+ architecture: ${{ matrix.platform }}
+
+ - name: Setup Environment variables
+ run: if [ "3.10" == "${{ 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@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/
+
+ - name: Package installation
+ run: |
+ python -m pip install wheelhouse/opencv*.whl
+ cd ${{ github.workspace }}/tests
+ python get_build_info.py
+
+ - name: Run tests
+ run: |
+ cd ${{ github.workspace }}/opencv
+ python modules/python/test/test.py -v --repo .
+
test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
- needs: [build]
+ needs: [build, test]
runs-on: ubuntu-latest
environment: test-opencv-python-release
defaults:
@@ -127,7 +191,7 @@ jobs:
release_opencv_python:
if: github.event_name == 'release' && !github.event.release.prerelease
- needs: [build]
+ needs: [build, test]
runs-on: ubuntu-latest
environment: opencv-python-release
defaults:
diff --git a/.github/workflows/build_wheels_macos_m1.yml b/.github/workflows/build_wheels_macos_m1.yml
index 79164dcf..3711e1b3 100644
--- a/.github/workflows/build_wheels_macos_m1.yml
+++ b/.github/workflows/build_wheels_macos_m1.yml
@@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os: [macOS-M1]
- python-version: ['3.7', '3.8', '3.9', '3.10']
+ python-version: ['3.7']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
@@ -31,7 +31,6 @@ jobs:
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
- OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
steps:
- name: Checkout
@@ -44,36 +43,72 @@ jobs:
if: github.event_name == 'pull_request'
run: git submodule update --remote
- - name: build script
+ - name: Build a package
run: |
git submodule update --init multibuild
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
export MACOSX_DEPLOYMENT_TARGET=11.0
- arch -arm64 python${{ matrix.python-version }} -m pip wheel --wheel-dir=wheelhouse . --verbose
+ arch -arm64 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
+ arch -arm64 python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
delocate-wheel ${{ github.workspace }}/wheelhouse/opencv*
- - name: before test
+ - name: Saving all wheels
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheels
+ path: wheelhouse/opencv*.whl
+
+ - name: Saving a wheel accordingly to matrix
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/opencv*.whl
+
+ test:
+ needs: [build]
+ runs-on: ${{ matrix.os }}
+
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [macOS-M1]
+ python-version: ['3.7', '3.8', '3.9', '3.10']
+ platform: [x64]
+ with_contrib: [0, 1]
+ without_gui: [0, 1]
+ build_sdist: [0]
+
+ env:
+ OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ submodules: true
+ fetch-depth: 0
+
+ - name: Download a wheel accordingly to matrix
+ uses: actions/download-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}
+ path: wheelhouse/
+
+ - name: Package installation
run: |
- git submodule update --init --recursive
arch -arm64 python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall wheelhouse/opencv*.whl
cd ${{ github.workspace }}/tests
arch -arm64 python${{ matrix.python-version }} get_build_info.py
- - name: run test
+ - name: Run tests
run: |
cd ${{ github.workspace }}/opencv
arch -arm64 python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
- - name: saving artifacts
- uses: actions/upload-artifact@v2
- with:
- name: wheels
- path: wheelhouse/opencv*.whl
-
test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
- needs: [build]
+ needs: [build, test]
runs-on: ubuntu-latest
environment: test-opencv-python-release
defaults:
@@ -92,7 +127,7 @@ jobs:
release_opencv_python:
if: github.event_name == 'release' && !github.event.release.prerelease
- needs: [build]
+ needs: [build, test]
runs-on: ubuntu-latest
environment: opencv-python-release
defaults:
diff --git a/.github/workflows/build_wheels_windows.yml b/.github/workflows/build_wheels_windows.yml
index 3eb13086..0f697291 100644
--- a/.github/workflows/build_wheels_windows.yml
+++ b/.github/workflows/build_wheels_windows.yml
@@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-latest]
- python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ python-version: ['3.6']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
@@ -55,38 +55,84 @@ jobs:
- name: Setup MSBuild.exe
uses: warrenbuckley/Setup-MSBuild@v1
- - name: build script
+ - name: Build a package
run: |
python --version
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools
- set "CI_BUILD=1" && python -m pip wheel --wheel-dir=%cd%\wheelhouse . --verbose
+ python -m pip install toml && python -c "import toml; c = toml.load('pyproject.toml'); print('\n'.join(c['build-system']['requires']))" >> requirements.txt | python -m pip install -r requirements.txt
+ set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp36 --dist-dir=%cd%\wheelhouse -v
shell: cmd
- - name: before test
+ - name: Saving all wheels
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheels
+ path: wheelhouse/opencv*.whl
+
+ - name: Saving a wheel accordingly to matrix
+ uses: actions/upload-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
+ path: wheelhouse/opencv*
+
+ test:
+ needs: [build-windows-x86_64]
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: powershell
+
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [windows-latest]
+ python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
+ platform: [x86, x64]
+ with_contrib: [0, 1]
+ without_gui: [0, 1]
+ build_sdist: [0]
+
+ env:
+ ACTIONS_ALLOW_UNSECURE_COMMANDS: true
+ OPENCV_TEST_DATA_PATH: ${{ github.workspace }}\opencv_extra\testdata
+
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+ with:
+ submodules: true
+ fetch-depth: 0
+
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v2
+ with:
+ python-version: ${{ matrix.python-version }}
+ architecture: ${{ matrix.platform }}
+
+ - name: Download a wheel accordingly to matrix
+ uses: actions/download-artifact@v2
+ with:
+ name: wheel-${{ matrix.with_contrib }}-${{ matrix.without_gui }}-${{ matrix.build_sdist }}-${{ matrix.platform }}
+ path: wheelhouse/
+
+ - name: Package installation
run: |
- git submodule update --init --recursive
cd ${{ github.workspace }}/tests
&python -m pip install --user --no-warn-script-location (ls "../wheelhouse/opencv*.whl")
if ($LastExitCode -ne 0) {throw $LastExitCode}
python get_build_info.py
shell: powershell
- - name: run test
+ - name: Run tests
run: |
cd ${{ github.workspace }}/opencv
python modules\python\test\test.py -v --repo .
shell: cmd
- - name: saving artifacts
- uses: actions/upload-artifact@v2
- with:
- name: wheels
- path: wheelhouse/opencv*.whl
-
test_release_opencv_python:
if: github.event_name == 'release' && github.event.release.prerelease
- needs: [build-windows-x86_64]
+ needs: [build-windows-x86_64, test]
runs-on: ubuntu-latest
environment: test-opencv-python-release
defaults:
@@ -105,7 +151,7 @@ jobs:
release_opencv_python:
if: github.event_name == 'release' && !github.event.release.prerelease
- needs: [build-windows-x86_64]
+ needs: [build-windows-x86_64, test]
runs-on: ubuntu-latest
environment: opencv-python-release
defaults:
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index c79e7de4..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,201 +0,0 @@
-environment:
- USER:
- secure: fXgF9uyy6sT0JoVOR7BoqA==
-
- PASS:
- secure: 0bXSOVjf9x8L7nErTivu92TF1FwNosTjFJQPmxp8Dys=
-
- matrix:
- - PYTHON: "C:\\Python36"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python36-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python37"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python37-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python38"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python38-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python39"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python39-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python36"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python36-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python37"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python37-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python38"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python38-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python39"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python39-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 0
-
- - PYTHON: "C:\\Python36"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python36-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python37"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python37-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python38"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python38-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python39"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python39-x64"
- ENABLE_CONTRIB: 0
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python36"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python36-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python37"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python37-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python38"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python38-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python39"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
- - PYTHON: "C:\\Python39-x64"
- ENABLE_CONTRIB: 1
- ENABLE_HEADLESS: 1
-
-matrix:
- fast_finish: true
-
-install:
- - ps: |
- if (-not (Test-Path $env:PYTHON)) {
- curl -o install_python.ps1 https://raw.githubusercontent.com/matthew-brett/multibuild/devel/install_python.ps1
- .\install_python.ps1
- }
- - ps: if (-not (Test-Path $env:PYTHON)) { throw "No $env:PYTHON" }
- - "set PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
- - python --version
-
-build_script:
-- cmd: |
- "%PYTHON%\\python.exe" -m pip install --upgrade pip
- "%PYTHON%\\python.exe" -m pip install --upgrade setuptools
- set "CI_BUILD=1" && "%PYTHON%\\python.exe" -m pip wheel --wheel-dir=%cd%\dist . --verbose
-
-before_test:
-- ps: |
-
- cd ${Env:APPVEYOR_BUILD_FOLDER}\tests
- $env:PYTHONWARNINGS = "ignore:::pip._internal.cli.base_command"
- &"${Env:PYTHON}\\python.exe" -m pip install --user --no-warn-script-location (ls "../dist/opencv_*.whl")
- if ($LastExitCode -ne 0) {throw $LastExitCode}
-
-test_script:
-- cmd: |
-
- cd %APPVEYOR_BUILD_FOLDER%\tests
- "%PYTHON%\\python.exe" -m unittest test
-
-artifacts:
-- path: dist\opencv*.whl
- name: wheels
-
-deploy_script:
-- ps: |
-
- if (${Env:APPVEYOR_REPO_TAG} -eq "true") {
- cd ${Env:APPVEYOR_BUILD_FOLDER}
- if (${Env:ENABLE_CONTRIB} -eq 0) {
- if (${Env:ENABLE_HEADLESS} -eq 0) {
- echo "This is a default build. Deployment will be done to PyPI entry opencv-python."
- }
- else {
- echo "This is a headless build. Deployment will be done to PyPI entry opencv-python-headless."
- }
- }
- else {
- if (${Env:ENABLE_HEADLESS} -eq 0) {
- echo "This is a contrib build. Deployment will be done to PyPI entry opencv-contrib-python."
- }
- else {
- echo "This is a headless contrib build. Deployment will be done to PyPI entry opencv-contrib-python-headless."
- }
- }
-
- &"${Env:PYTHON}\\python.exe" -m pip install twine
- &"${Env:PYTHON}\\python.exe" -m twine upload -u ${Env:USER} -p ${Env:PASS} --skip-existing dist/opencv*
- }
- else {
- echo "Tag not set, deployment skipped."
- }
diff --git a/setup.py b/setup.py
index 9dcc030e..ca6b2ff5 100644
--- a/setup.py
+++ b/setup.py
@@ -22,26 +22,15 @@ def main():
build_headless = get_build_env_var_by_name("headless")
build_java = "ON" if get_build_env_var_by_name("java") else "OFF"
- if sys.version_info[:2] >= (3, 6):
- minimum_supported_numpy = "1.13.3"
- if sys.version_info[:2] >= (3, 7):
- minimum_supported_numpy = "1.14.5"
- if sys.version_info[:2] >= (3, 8):
- minimum_supported_numpy = "1.17.3"
- if sys.version_info[:2] >= (3, 9):
- minimum_supported_numpy = "1.19.3"
- if sys.version_info[:2] >= (3, 10):
- minimum_supported_numpy = "1.21.2"
-
- # linux arm64 is a special case
- if sys.platform.startswith("linux") and sys.version_info[:2] >= (3, 6) and platform.machine() == "aarch64":
- minimum_supported_numpy = "1.19.3"
-
- # macos arm64 is a special case
- if sys.platform == "darwin" and sys.version_info[:2] >= (3, 6) and platform.machine() == "arm64":
- minimum_supported_numpy = "1.21.0"
-
- numpy_version = "numpy>=%s" % minimum_supported_numpy
+ install_requires = [
+ 'numpy>=1.13.3; python_version<"3.7"',
+ 'numpy>=1.14.5; python_version>="3.7"',
+ 'numpy>=1.17.3; python_version>="3.8"',
+ 'numpy>=1.19.3; python_version>="3.9"',
+ 'numpy>=1.21.2; python_version>="3.10"',
+ 'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
+ 'numpy>=1.21.2; python_version>="3.6" and platform_system=="Darwin" and platform_machine=="arm64"',
+ ]
python_version = cmaker.CMaker.get_python_version()
python_lib_path = cmaker.CMaker.get_python_library(python_version).replace(
@@ -108,8 +97,8 @@ def main():
# Naming conventions vary so widely between versions and OSes
# had to give up on checking them.
[
- "python/cv2/python-%s.%s/cv2[^/]*%s"
- % (sys.version_info[0], sys.version_info[1], re.escape(sysconfig.get_config_var("EXT_SUFFIX")))
+ r"python/cv2/python-%s/cv2.*"
+ % (sys.version_info[0])
]
+
[
@@ -158,6 +147,7 @@ def main():
"-DBUILD_TESTS=OFF",
"-DBUILD_PERF_TESTS=OFF",
"-DBUILD_DOCS=OFF",
+ "-DPYTHON3_LIMITED_API=ON",
]
+ (
# If it is not defined 'linker flags: /machine:X86' on Windows x64
@@ -245,7 +235,7 @@ def main():
package_data=package_data,
maintainer="Olli-Pekka Heinisuo",
ext_modules=EmptyListWithLength(),
- install_requires=numpy_version,
+ install_requires=install_requires,
python_requires=">=3.6",
classifiers=[
"Development Status :: 5 - Production/Stable",
@@ -368,7 +358,7 @@ def _classify_installed_files_override(
# lines for a proper work using pylint and an autocomplete in IDE
with open(os.path.join(cmake_install_dir, "python", "cv2", "__init__.py"), 'r') as opencv_init:
opencv_init_lines = opencv_init.readlines()
- extra_imports = ('\nfrom .cv2 import *\nfrom . import data\n')
+ extra_imports = ('\nfrom .cv2 import *\nfrom . import data\nfrom . import version\n')
free_line_after_imports = 5
opencv_init_lines.insert(free_line_after_imports, extra_imports)
@@ -378,8 +368,8 @@ def _classify_installed_files_override(
# add lines from the old __init__.py file to the config file
with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'scripts', '__init__.py'), 'r') as custom_init:
custom_init_data = custom_init.read()
- with open('%spython/cv2/config-%s.%s.py'
- % (cmake_install_dir, sys.version_info[0], sys.version_info[1]), 'w') as opencv_init_config:
+ with open('%spython/cv2/config-%s.py'
+ % (cmake_install_dir, sys.version_info[0]), 'w') as opencv_init_config:
opencv_init_config.write(custom_init_data)
for package_name, relpaths_re in cls.package_paths_re.items():
diff --git a/travis_config.sh b/travis_config.sh
index 6d6cc06b..7bbfec68 100644
--- a/travis_config.sh
+++ b/travis_config.sh
@@ -14,7 +14,9 @@ function bdist_wheel_cmd {
# copied from multibuild's common_utils.sh
# add osx deployment target so it doesn't default to 10.6
local abs_wheelhouse=$1
- CI_BUILD=1 pip wheel --verbose --wheel-dir="$PWD/dist" . $BDIST_PARAMS
+ # install all required packages in pyproject.toml, because bdist_wheel does not do it
+ python${PYTHON_VERSION} -m pip install toml && python${PYTHON_VERSION} -c 'import toml; c = toml.load("pyproject.toml"); print("\n".join(c["build-system"]["requires"]))' | python${PYTHON_VERSION} -m pip install -r /dev/stdin
+ CI_BUILD=1 python${PYTHON_VERSION} setup.py bdist_wheel --py-limited-api=cp36 -v
cp dist/*.whl $abs_wheelhouse
if [ -z "$IS_OSX" ]; then
# this path can be changed in the latest manylinux image
@@ -22,8 +24,6 @@ function bdist_wheel_cmd {
/opt/python/cp39-cp39/bin/python -m venv $TOOLS_PATH
source $TOOLS_PATH/bin/activate
python patch_auditwheel_whitelist.py
- # to avoid issues with numpy wheels
- rm /io/wheelhouse/numpy*
deactivate
fi
if [ -n "$USE_CCACHE" -a -z "$BREW_BOOTSTRAP_MODE" ]; then ccache -s; fi
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy