Skip to content

Commit b776e5c

Browse files
authoredFeb 21, 2023
Merge pull request #790 from asmorkalov/as/docs_update
Docs and meta information update for release
2 parents 79e1384 + 277cab9 commit b776e5c

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed
 

‎.github/workflows/build_wheels_macos.yml

-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
SDIST: ${{ matrix.build_sdist || 0 }}
4949
ENABLE_HEADLESS: ${{ matrix.without_gui }}
5050
ENABLE_CONTRIB: ${{ matrix.with_contrib }}
51-
MACOSX_DEPLOYMENT_TARGET: 10.13
5251
steps:
5352
- name: Cleanup
5453
run: find . -mindepth 1 -delete

‎README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,16 @@ The default ``manylinux2014`` images have been extended with some OpenCV depende
216216

217217
Python 3.x compatible pre-built wheels are provided for the officially supported Python versions (not in EOL):
218218

219-
- 3.6
220219
- 3.7
221220
- 3.8
222221
- 3.9
223222
- 3.10
223+
- 3.11
224224

225225
### Backward compatibility
226226

227227
Starting from 4.2.0 and 3.4.9 builds the macOS Travis build environment was updated to XCode 9.4. The change effectively dropped support for older than 10.13 macOS versions.
228228

229229
Starting from 4.3.0 and 3.4.10 builds the Linux build environment was updated from `manylinux1` to `manylinux2014`. This dropped support for old Linux distributions.
230230

231+
Starting from version 4.7.0 the Mac OS GitHub Actions build environment was update to version 11. Mac OS 10.x support depricated. See https://github.com/actions/runner-images/issues/5583

‎pyproject.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ requires = [
88
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
99
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
1010
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
11-
"numpy==1.21.2; python_version>='3.10' and platform_system!='Darwin'",
12-
"numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'"
11+
"numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
12+
"numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
13+
"numpy==1.22.0; python_version>='3.11'"
1314
]

‎setup.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def main():
3232
'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
3333
'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
3434
'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
35+
"numpy>=1.22.0; python_version>='3.11'"
3536
]
3637

3738
python_version = cmaker.CMaker.get_python_version()
@@ -262,7 +263,7 @@ def main():
262263
name=package_name,
263264
version=package_version,
264265
url="https://github.com/opencv/opencv-python",
265-
license="MIT",
266+
license="Apache 2.0",
266267
description="Wrapper package for OpenCV python bindings.",
267268
long_description=long_description,
268269
long_description_content_type="text/markdown",
@@ -279,7 +280,7 @@ def main():
279280
"Intended Audience :: Education",
280281
"Intended Audience :: Information Technology",
281282
"Intended Audience :: Science/Research",
282-
"License :: OSI Approved :: MIT License",
283+
"License :: OSI Approved :: Apache 2.0",
283284
"Operating System :: MacOS",
284285
"Operating System :: Microsoft :: Windows",
285286
"Operating System :: POSIX",
@@ -292,6 +293,7 @@ def main():
292293
"Programming Language :: Python :: 3.8",
293294
"Programming Language :: Python :: 3.9",
294295
"Programming Language :: Python :: 3.10",
296+
"Programming Language :: Python :: 3.11",
295297
"Programming Language :: C++",
296298
"Programming Language :: Python :: Implementation :: CPython",
297299
"Topic :: Scientific/Engineering",

0 commit comments

Comments
 (0)
Please sign in to comment.