未验证 提交 b776e5ce 编写于 作者: A Alexander Smorkalov 提交者: GitHub

Merge pull request #790 from asmorkalov/as/docs_update

Docs and meta information update for release
...@@ -48,7 +48,6 @@ jobs: ...@@ -48,7 +48,6 @@ jobs:
SDIST: ${{ matrix.build_sdist || 0 }} SDIST: ${{ matrix.build_sdist || 0 }}
ENABLE_HEADLESS: ${{ matrix.without_gui }} ENABLE_HEADLESS: ${{ matrix.without_gui }}
ENABLE_CONTRIB: ${{ matrix.with_contrib }} ENABLE_CONTRIB: ${{ matrix.with_contrib }}
MACOSX_DEPLOYMENT_TARGET: 10.13
steps: steps:
- name: Cleanup - name: Cleanup
run: find . -mindepth 1 -delete run: find . -mindepth 1 -delete
......
...@@ -216,11 +216,11 @@ The default ``manylinux2014`` images have been extended with some OpenCV depende ...@@ -216,11 +216,11 @@ The default ``manylinux2014`` images have been extended with some OpenCV depende
Python 3.x compatible pre-built wheels are provided for the officially supported Python versions (not in EOL): Python 3.x compatible pre-built wheels are provided for the officially supported Python versions (not in EOL):
- 3.6
- 3.7 - 3.7
- 3.8 - 3.8
- 3.9 - 3.9
- 3.10 - 3.10
- 3.11
### Backward compatibility ### Backward compatibility
...@@ -228,3 +228,4 @@ Starting from 4.2.0 and 3.4.9 builds the macOS Travis build environment was upda ...@@ -228,3 +228,4 @@ Starting from 4.2.0 and 3.4.9 builds the macOS Travis build environment was upda
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. 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.
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
...@@ -8,6 +8,7 @@ requires = [ ...@@ -8,6 +8,7 @@ requires = [
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'", "numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'", "numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'", "numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.21.2; python_version>='3.10' and platform_system!='Darwin'", "numpy==1.21.2; python_version=='3.10' and platform_system!='Darwin'",
"numpy==1.21.4; python_version>='3.10' and platform_system=='Darwin'" "numpy==1.21.4; python_version=='3.10' and platform_system=='Darwin'",
"numpy==1.22.0; python_version>='3.11'"
] ]
...@@ -32,6 +32,7 @@ def main(): ...@@ -32,6 +32,7 @@ def main():
'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"', 'numpy>=1.19.3; python_version>="3.6" and platform_system=="Linux" and platform_machine=="aarch64"',
'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"', 'numpy>=1.21.0; python_version<="3.9" and platform_system=="Darwin" and platform_machine=="arm64"',
'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"', 'numpy>=1.21.4; python_version>="3.10" and platform_system=="Darwin"',
"numpy>=1.22.0; python_version>='3.11'"
] ]
python_version = cmaker.CMaker.get_python_version() python_version = cmaker.CMaker.get_python_version()
...@@ -262,7 +263,7 @@ def main(): ...@@ -262,7 +263,7 @@ def main():
name=package_name, name=package_name,
version=package_version, version=package_version,
url="https://github.com/opencv/opencv-python", url="https://github.com/opencv/opencv-python",
license="MIT", license="Apache 2.0",
description="Wrapper package for OpenCV python bindings.", description="Wrapper package for OpenCV python bindings.",
long_description=long_description, long_description=long_description,
long_description_content_type="text/markdown", long_description_content_type="text/markdown",
...@@ -279,7 +280,7 @@ def main(): ...@@ -279,7 +280,7 @@ def main():
"Intended Audience :: Education", "Intended Audience :: Education",
"Intended Audience :: Information Technology", "Intended Audience :: Information Technology",
"Intended Audience :: Science/Research", "Intended Audience :: Science/Research",
"License :: OSI Approved :: MIT License", "License :: OSI Approved :: Apache 2.0",
"Operating System :: MacOS", "Operating System :: MacOS",
"Operating System :: Microsoft :: Windows", "Operating System :: Microsoft :: Windows",
"Operating System :: POSIX", "Operating System :: POSIX",
...@@ -292,6 +293,7 @@ def main(): ...@@ -292,6 +293,7 @@ def main():
"Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9", "Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: C++", "Programming Language :: C++",
"Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: CPython",
"Topic :: Scientific/Engineering", "Topic :: Scientific/Engineering",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册