Skip to content

Commit ac1b885

Browse files
committed
Merge branch '4.x' into 5.x-merge-4.x
2 parents 6d05488 + 1cf6186 commit ac1b885

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

.github/workflows/build_wheels_manylinux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
strategy:
9494
fail-fast: false
9595
matrix:
96-
python-version: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
96+
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
9797
platform: [x86_64, aarch64]
9898
manylinux: [2014, 2_28]
9999
with_contrib: [0, 1]
@@ -110,7 +110,7 @@ jobs:
110110
SDIST: ${{ matrix.build_sdist || 0 }}
111111
ENABLE_HEADLESS: ${{ matrix.without_gui }}
112112
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
113-
DOCKER_TEST_IMAGE: ${{ matrix.platform == 'aarch64' && 'quay.io/opencv-ci/multibuild-focal_arm64v8:2025-11-13' || '' }}
113+
DOCKER_TEST_IMAGE: ${{ matrix.platform == 'aarch64' && 'quay.io/opencv-ci/multibuild-noble_arm64v8:2026-06-15' || '' }}
114114
steps:
115115
- name: Cleanup
116116
run: find . -mindepth 1 -delete

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ Python 3.x compatible pre-built wheels are provided for the officially supported
243243
- 3.11
244244
- 3.12
245245
- 3.13
246+
- 3.14
246247

247248
### Backward compatibility
248249

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,16 @@ def main():
7373
# https://stackoverflow.com/questions/1405913/python-32bit-or-64bit-mode
7474
is64 = sys.maxsize > 2 ** 32
7575

76-
package_name = "opencv-python"
76+
package_name = "opencv_python"
7777

7878
if build_contrib and not build_headless:
79-
package_name = "opencv-contrib-python"
79+
package_name = "opencv_contrib_python"
8080

8181
if build_contrib and build_headless:
82-
package_name = "opencv-contrib-python-headless"
82+
package_name = "opencv_contrib_python_headless"
8383

8484
if build_headless and not build_contrib:
85-
package_name = "opencv-python-headless"
85+
package_name = "opencv_python_headless"
8686

8787
if build_rolling:
8888
package_name += "-rolling"

0 commit comments

Comments
 (0)