Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

5.x merge 4.x#1054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
asmorkalov merged 106 commits intoopencv:5.xfromasmorkalov:5.x-merge-4.x
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
106 commits
Select commitHold shift + click to select a range
2585d6f
Run pipelines on 4.x and 5.x branches (#697)
asenyaevAug 1, 2022
615f3df
Scheduled rolling workflows (#699)
asenyaevAug 3, 2022
60630d1
macOS x86_64 runner change to macos-11 (#701)
asenyaevAug 5, 2022
e65f21f
Adapted rolling releases to workflow_dispatch event (#708)
asenyaevAug 21, 2022
7bb3e77
Remove source packages for rolling packages (#711)
asenyaevAug 22, 2022
379d281
Build zlib from the source on Linux with the latest version (#715)
asenyaevAug 26, 2022
deb3903
Build x64 macOS wheels for 10.13 build target (#716)
joeyballentineAug 29, 2022
3725898
Bump numpy version to 1.21.4 for macOS builds (#720)
asenyaevAug 29, 2022
3b13ba7
Add Vulkan license text to LICENSE-3RD-PARTY.txt
peter-kovacs-aimotiveNov 7, 2022
f6be1c8
OpenCV dependnecies update.
asmorkalovNov 29, 2022
0bff35d
Stick to CMake 3.24 on Windows to work around 3.25 regression.
asmorkalovDec 5, 2022
b7a1da7
Merge pull request #751 from asmorkalov/as/dependencies_update
asmorkalovDec 5, 2022
8efd7aa
Merge pull request #754 from asmorkalov/as/cmake_3.25_regression_win
asmorkalovDec 5, 2022
8f26419
Update pypi default index url
asenyaevDec 12, 2022
7da6fce
Define arch for all workflows on aarch64
asenyaevDec 12, 2022
ede2269
Merge pull request #759 from asenyaev:asen/pypi_fix
asmorkalovDec 13, 2022
8f71702
Pipelines update for FFmpeg 5 and security fixes.
asmorkalovDec 5, 2022
4510a68
Update OpenCV to upstream version to get FFmpeg 5 fixes.
asmorkalovDec 8, 2022
46f2109
Added fonts needed for Qt.
asmorkalovDec 9, 2022
d780d93
Reverted some changes from 602a8be9e21df225a32827a621f15d7be0e5eebd t…
asmorkalovDec 9, 2022
2b57f53
Use ffmpeg instead of opencv_ffmpeg everywhere.
asmorkalovDec 15, 2022
7ebbdc3
Merge pull request #756 from asmorkalov:as/pipelines_update_4.7
asmorkalovDec 20, 2022
339bca5
OpenCV 4.7.0 release preparation
asmorkalovDec 29, 2022
e2ba09d
Fix typo in README.md
AlexeySalminJan 5, 2023
e33b16b
fix: Stop trying to use two different numpy on mac with python >= 3.10
TheClericJan 11, 2023
736b905
OpenCV package does not distribute zlib (#780)
asmorkalovJan 20, 2023
28b8277
Typo fix.
asmorkalovJan 24, 2023
77db6ba
Merge pull request #776 from TheCleric/fix/numpy_version_mac
asmorkalovJan 24, 2023
3fab1bb
Merge pull request #768 from AlexeySalmin/patch-1
asmorkalovJan 25, 2023
9620162
Merge pull request #744 from peter-kovacs-aimotive/add-vulkan-license
asmorkalovJan 26, 2023
876f5e3
Migrate Mac M1 builds to another host.
asmorkalovFeb 2, 2023
79e1384
Merge pull request #787 from asmorkalov/as/migrate_mac_m1
asmorkalovFeb 3, 2023
6e097a8
Docs and meta information update for release.
asmorkalovFeb 3, 2023
352caf1
Use default deployment target on Mac OS x64.
asmorkalovFeb 7, 2023
277cab9
Fixed numpy dependency issue with Python 3.11.
asmorkalovFeb 20, 2023
b776e5c
Merge pull request #790 from asmorkalov/as/docs_update
asmorkalovFeb 21, 2023
fdf8fa4
Renamed license to match Pypi classifier.
asmorkalovFeb 22, 2023
f9de34e
Merge pull request #803 from asmorkalov/as/license
asmorkalovFeb 22, 2023
e10f83d
Handle setup with and without PYTHON3_LIMITED_API.
asmorkalovMar 15, 2023
6b73d90
Merge pull request #820 from asmorkalov/as/config_py_path
asmorkalovMar 16, 2023
2a76f21
py38 build requires: update numpy for compatibility with OpenCV src
bertskyApr 26, 2023
76e62b2
find_version: use + for git_hash to conform to PEP 440
bertskyApr 26, 2023
2e44d30
fix: handle None case for python library
henryiiiApr 27, 2023
264e05b
Merge pull request #838 from henryiii/patch-2
asmorkalovMay 29, 2023
0ba2c80
Merge pull request #837 from bertsky/fix-py38-build
asmorkalovMay 29, 2023
46d2ddf
Temporary hack to fix build regression with Scikit-build 0.17.3 and n…
asmorkalovMay 27, 2023
ccb99df
Merge pull request #852 from asmorkalov:as/ci_check
asmorkalovMay 31, 2023
ad3e759
Force python3 in build procedure to generate python stubs.
asmorkalovMay 26, 2023
45e535e
Fix: numpy version for python 3.11 (#839)
tomsweetingMay 31, 2023
474a1cc
Merge pull request #849 from asmorkalov/as/python3_for_build
asmorkalovJun 1, 2023
3dee384
Try to add pyi files to package.
asmorkalovJun 1, 2023
e4da6a0
Update OpenCV to current 4.x to get PR #20370
asmorkalovJun 1, 2023
b534ea2
Merge pull request #853 from asmorkalov/as/add_pyi_to_package
asmorkalovJun 10, 2023
e26e6e4
Build environment update on Linux.
asmorkalovJun 28, 2023
0ec125d
Merge pull request #862 from asmorkalov/as/deps_update
asmorkalovJun 29, 2023
d82d7c2
fix: update build system with CMAKE_ARGS from scikit-build
henryiiiApr 11, 2023
49505b9
OpenCV submodules update to 4.8.0.
asmorkalovJun 29, 2023
7f0002b
Added more licenses for 3rd party components distributed with opencv-…
asmorkalovJun 29, 2023
04bfb47
Updated wheel location for custom builds.
asmorkalovJun 29, 2023
413512c
Merge pull request #831 from henryiii/patch-1
asmorkalovJun 30, 2023
a335cbe
Merge pull request #864 from asmorkalov/as/opencv_4.8.0
asmorkalovJun 30, 2023
413894a
Merge pull request #866 from asmorkalov/as/dist_location
asmorkalovJun 30, 2023
3c972ca
Merge pull request #865 from asmorkalov/as/3rdparty_license_update
asmorkalovJun 30, 2023
921bae4
Added missing typing/__init__.py to package.
asmorkalovJul 5, 2023
43cd716
Merge pull request #870 from asmorkalov/as/typing_runtime
asmorkalovJul 11, 2023
5308d0b
docs: added TOC to README for easier navigation
engnadeauAug 7, 2023
705bb5d
Merge pull request #882 from engnadeau/docs/readme-toc
asmorkalovAug 9, 2023
ca13925
Update to OpenCV 4.8.1.
asmorkalovSep 27, 2023
4493945
Docker images update for Python 3.12 and security fixes.
asmorkalovOct 12, 2023
1051e53
Merge pull request #905 from asmorkalov/as/docker_update_python3.12
asmorkalovOct 15, 2023
c9145d9
Update downloads badge
dkurtOct 18, 2023
7cfd1ee
Merge pull request #907 from dkurt:patch-1
asmorkalovOct 18, 2023
98573ce
Change setup.py to trigger GitHub show dependents
dkurtDec 9, 2023
0da732e
Python 3.12 support.
asmorkalovOct 3, 2023
91555be
Merge pull request #927 from dkurt:try_enable_dependents
asmorkalovDec 21, 2023
984ff73
Include Intel IPP license text to 3rd party licenses list.
asmorkalovDec 21, 2023
b77b2c8
Merge pull request #904 from asmorkalov:as/python_3.12
asmorkalovDec 22, 2023
c886152
Merge pull request #931 from asmorkalov:as/ipp_icv_license
asmorkalovDec 22, 2023
f5c47b3
Linux environment update for release 4.9.0
asmorkalovDec 25, 2023
ea3538a
Merge pull request #932 from asmorkalov/as/pre-4.9.0_linux_upgrade
asmorkalovDec 26, 2023
e7a86f9
Use native Mac M1 Github Runner for the configuration.
asmorkalovDec 26, 2023
1e1b0ca
Migrate Mac OS Intel to OSX 12.
asmorkalovDec 26, 2023
bbcc41e
Merge pull request #936 from asmorkalov:as/mac_intel_update
asmorkalovDec 27, 2023
60cc2d2
Merge pull request #934 from asmorkalov/as/native_mac_m1_runner
asmorkalovDec 27, 2023
042e0e0
Submodules update to tag 4.9.0.
asmorkalovDec 27, 2023
d2a08b9
Merge pull request #938 from asmorkalov"as/4.9.0-pre
asmorkalovDec 29, 2023
eaa9512
Added donation notification.
asmorkalovDec 29, 2023
8fce57f
Merge pull request #940 from asmorkalov:as/donation
asmorkalovDec 29, 2023
080da76
Run Python test on Mac M1 in virtual environment to prevent "error: e…
asmorkalovDec 29, 2023
949b65e
Upgrade pip on Mac M1 before package installation.
asmorkalovDec 30, 2023
fe67f8e
Merge pull request #941 from asmorkalov/as/mac_m1_venv_for_test
asmorkalovDec 30, 2023
fcf02c6
Readme update for 4.9.0.
asmorkalovDec 31, 2023
8ad8ec1
Merge branch 'as/4.9.0-readme-update' into 4.x
asmorkalovDec 31, 2023
ebd0aee
Use Github sponsor link.
asmorkalovMay 21, 2024
927faa5
Merge pull request #983 from asmorkalov/as/sponsor_link
asmorkalovMay 21, 2024
542cf06
Dependencies update for 4.10.0 release. (#984)
asmorkalovMay 30, 2024
d261ecb
Added license text for OrbbecSDK needed on MacOS ARM64.
asmorkalovJun 3, 2024
5f132ad
Merge pull request #991 from asmorkalov/as/licence_update_4.10.0
asmorkalovJun 3, 2024
63eed93
Update submodules to 4.10.0-pre for testing. (#990)
asmorkalovJun 3, 2024
512209a
Update Numpy requirements in the project.
asmorkalovJun 3, 2024
3276dc6
Merge pull request #992 from asmorkalov:as/update_numpty
asmorkalovJun 3, 2024
00e1209
Alternative solution to use Numpy 2.0 for Python 3.9+ packages.
asmorkalovJun 17, 2024
cce7c99
Merge pull request #1002 from asmorkalov:as/numpy_2.0_v2
asmorkalovJun 17, 2024
92204bd
chore: minor text fixes in readme
GornokaJul 16, 2024
6a181ce
Merge pull request #1015 from Gornoka:patch-1
asmorkalovJul 24, 2024
dbaf1a2
Merge branch '4.x' into 5.x-merge-4.x
asmorkalovNov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions.github/workflows/build_wheels_linux.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6']
python-version: ['3.9']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -41,7 +41,7 @@ jobs:
MB_ML_VER: 2014
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220824
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
USE_CCACHE: 0
UNICODE_WIDTH: 32
PLAT: x86_64
Expand DownExpand Up@@ -84,7 +84,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -93,7 +93,7 @@ jobs:
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
NP_TEST_DEP_LATEST: numpy==2.0.0
CONFIG_PATH: travis_config.sh
PLAT: x86_64
steps:
Expand All@@ -106,7 +106,7 @@ jobs:
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
run: if [ "3.10" == "${{ matrix.python-version }}"-o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ 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@v3
with:
Expand DownExpand Up@@ -139,7 +139,7 @@ jobs:
NP_TEST_DEP: numpy==1.19.4
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20220628
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-x86-64:20240524
USE_CCACHE: 1
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand Down
10 changes: 5 additions & 5 deletions.github/workflows/build_wheels_linux_arm.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6']
python-version: ['3.9']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -42,7 +42,7 @@ jobs:
MB_ML_VER: 2014
TRAVIS_BUILD_DIR: ${{ github.workspace }}
CONFIG_PATH: travis_config.sh
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20220824
DOCKER_IMAGE: quay.io/opencv-ci/opencv-python-manylinux2014-aarch64:20240524
USE_CCACHE: 0
UNICODE_WIDTH: 32
SDIST: ${{ matrix.build_sdist || 0 }}
Expand DownExpand Up@@ -84,7 +84,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -94,7 +94,7 @@ jobs:
MB_PYTHON_VERSION: ${{ matrix.python-version }}
PLAT: aarch64
NP_TEST_DEP: numpy==1.19.4
NP_TEST_DEP_LATEST: numpy==1.21.4
NP_TEST_DEP_LATEST: numpy==2.0.0
CONFIG_PATH: travis_config.sh
DOCKER_TEST_IMAGE: multibuild/focal_arm64v8
UNICODE_WIDTH: 32
Expand All@@ -108,7 +108,7 @@ jobs:
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
run: if [ "3.10" == "${{ matrix.python-version }}"-o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ 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@v3
with:
Expand Down
22 changes: 13 additions & 9 deletions.github/workflows/build_wheels_macos.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,14 +20,14 @@ on:

jobs:
Build:
runs-on: macos-11
runs-on: macos-12
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
python-version: ['3.6']
python-version: ['3.9']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -45,11 +45,9 @@ jobs:
USE_CCACHE: 1
UNICODE_WIDTH: 32
PLAT: x86_64
FFMPEG_FORMULA_VERSION: '@4'
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
MACOSX_DEPLOYMENT_TARGET: 10.13
steps:
- name: Cleanup
run: find . -mindepth 1 -delete
Expand All@@ -59,6 +57,12 @@ 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:
Expand DownExpand Up@@ -94,14 +98,14 @@ jobs:

Test:
needs: [Build]
runs-on: macos-11
runs-on: macos-12
defaults:
run:
shell: bash
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -110,7 +114,7 @@ jobs:
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
NP_TEST_DEP_LATEST: numpy==2.0.0
CONFIG_PATH: travis_config.sh
PLAT: x86_64
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}/opencv_extra/testdata
Expand All@@ -130,7 +134,7 @@ jobs:
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
run: if [ "3.10" == "${{ matrix.python-version }}"-o "3.11" == "${{ matrix.python-version }}" -o "3.12" == "${{ 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@v3
with:
Expand All@@ -147,7 +151,7 @@ jobs:
python modules/python/test/test.py -v --repo .
- name: Pylint test
run: |
python -m pip install pylint==2.12.2
python -m pip install pylint==2.15.9
cd ${{ github.workspace }}/tests
python -m pylint $PYLINT_TEST_FILE

Expand Down
30 changes: 20 additions & 10 deletions.github/workflows/build_wheels_macos_m1.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,11 +20,11 @@ on:

jobs:
Build:
runs-on:opencv-cn-mac-arm64
runs-on:python-macos11-m1
strategy:
fail-fast: false
matrix:
python-version: ['3.7']
python-version: ['3.9']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand All@@ -34,6 +34,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
Expand All@@ -54,8 +55,8 @@ jobs:
echo $ENABLE_CONTRIB > contrib.enabled
echo $ENABLE_HEADLESS > headless.enabled
export MACOSX_DEPLOYMENT_TARGET=11.0
arch -arm64python${{ 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 -arm64python${{ matrix.python-version }} setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=wheelhouse -v
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 all wheels
uses: actions/upload-artifact@v3
Expand All@@ -74,14 +75,15 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
platform: [x64]
with_contrib: [0, 1]
without_gui: [0, 1]
build_sdist: [0]
env:
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
Expand All@@ -96,20 +98,28 @@ jobs:
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: |
arch -arm64 python${{ matrix.python-version }} -m pip install --user --no-cache --force-reinstall 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
arch -arm64python${{ matrix.python-version }} 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
arch -arm64python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
python${{ matrix.python-version }} modules/python/test/test.py -v --repo .
- name: Pylint test
run: |
arch -arm64 python${{ matrix.python-version }} -m pip install pylint==2.12.2
source ${{ github.workspace }}/opencv_test/bin/activate
python${{ matrix.python-version }} -m pip install pylint==2.15.9
cd ${{ github.workspace }}/tests
arch -arm64python${{ matrix.python-version }} -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' }}
Expand Down
10 changes: 6 additions & 4 deletions.github/workflows/build_wheels_windows.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6']
python-version: ['3.9']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand DownExpand Up@@ -60,12 +60,14 @@ jobs:
- name: Setup MSBuild.exe
uses: microsoft/setup-msbuild@v1.1
- name: Build a package
# CMake 3.25 regression fix. See https://stackoverflow.com/questions/74162633/problem-compiling-from-source-opencv-with-mvsc2019-in-64-bit-version
run: |
python --version
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools
python -m pip install cmake==3.24.2
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
set "CI_BUILD=1" && python setup.py bdist_wheel --py-limited-api=cp37 --dist-dir=%cd%\wheelhouse -v
shell: cmd
- name: Saving all wheels
uses: actions/upload-artifact@v3
Expand All@@ -87,7 +89,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
platform: [x86, x64]
with_contrib: [0, 1]
without_gui: [0, 1]
Expand DownExpand Up@@ -131,7 +133,7 @@ jobs:
python modules\python\test\test.py -v --repo .
- name: Pylint test
run: |
python -m pip install pylint==2.12.2
python -m pip install pylint==2.15.9
cd ${{ github.workspace }}\tests
python -m pylint $PYLINT_TEST_FILE

Expand Down
Loading
Loading
[8]ページ先頭
©2009-2025 Movatter.jp