Skip to content

5.x merge 4.x #1239

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Open
asmorkalov wants to merge 10 commits into
base: 5.x
Choose a base branch
from
+8 −7
Open

5.x merge 4.x #1239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9914d1e
Fixed project naming to generate proper sdist archive names.
asmorkalov Feb 5, 2026
0d3e751
Add Python 3.14 support in README
stackaditi May 3, 2026
0608ac1
Update README to include Python 3.14
MaulikMhatre May 13, 2026
e8ca24b
Added tests with Python 3.14. (#1232)
asmorkalov Jun 18, 2026
19ba8ad
Merge pull request #1227 from MaulikMhatre:update-readme-py314
asmorkalov Jun 18, 2026
5b05b60
Switch to Windows 2022 to use the same Visual Studio.
asmorkalov Jun 19, 2026
ac3082d
Merge pull request #1236 from asmorkalov:as/windows_4.x
asmorkalov Jun 19, 2026
e6f59cd
Merge pull request #1203 from asmorkalov:as/sdist_naming
asmorkalov Jun 26, 2026
1cf6186
Merge pull request #1220 from stackaditi:4.x
asmorkalov Jun 26, 2026
ac1b885
Merge branch '4.x' into 5.x-merge-4.x
asmorkalov Jun 28, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/build_wheels_manylinux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,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.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
platform: [x86_64, aarch64]
manylinux: [2014, 2_28]
with_contrib: [0, 1]
Expand All @@ -110,7 +110,7 @@ jobs:
SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
DOCKER_TEST_IMAGE: ${{ matrix.platform == 'aarch64' && 'quay.io/opencv-ci/multibuild-focal_arm64v8:2025-11-13' || '' }}
DOCKER_TEST_IMAGE: ${{ matrix.platform == 'aarch64' && 'quay.io/opencv-ci/multibuild-noble_arm64v8:2026-06-15' || '' }}
steps:
- name: Cleanup
run: find . -mindepth 1 -delete
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ Python 3.x compatible pre-built wheels are provided for the officially supported
- 3.11
- 3.12
- 3.13
- 3.14

### Backward compatibility

Expand Down
2 changes: 1 addition & 1 deletion multibuild
Open in desktop
Submodule multibuild updated 20 files
+0 −91 .appveyor.yml
+5 −11 .github/workflows/lint_python.yml
+19 −10 .github/workflows/test.yml
+4 −0 .gitignore
+1 −1 LICENSE
+37 −172 README.rst
+17 −9 common_utils.sh
+50 −48 library_builders.sh
+43 −23 osx_utils.sh
+16 −12 supported_wheels.py
+13 −0 tests/patches/harfbuzz-2.7.4.tar.xz.patch
+1 −2 tests/test_common_utils.sh
+5 −1 tests/test_fill_pyver.sh
+1 −1 tests/test_fill_submodule.sh
+5 −1 tests/test_library_builders.sh
+0 −2 tests/test_multibuild.sh
+33 −9 tests/test_osx_utils.sh
+1 −11 tests/test_python_install.sh
+3 −3 tests/test_supported_wheels.sh
+2 −2 travis_linux_steps.sh
8 changes: 4 additions & 4 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ def main():
# https://stackoverflow.com/questions/1405913/python-32bit-or-64bit-mode
is64 = sys.maxsize > 2 ** 32

package_name = "opencv-python"
package_name = "opencv_python"

if build_contrib and not build_headless:
package_name = "opencv-contrib-python"
package_name = "opencv_contrib_python"

if build_contrib and build_headless:
package_name = "opencv-contrib-python-headless"
package_name = "opencv_contrib_python_headless"

if build_headless and not build_contrib:
package_name = "opencv-python-headless"
package_name = "opencv_python_headless"

if build_rolling:
package_name += "-rolling"
Expand Down
Loading