Skip to content

O
opencv-python

OpenCV / opencv-python
11 个月 前同步成功

通知 230
Star 3707
Fork 754
O
opencv-python

体验新版 GitCode，发现更多精彩内容 >>

提交 58f0105b 编写于 作者: O Olli-Pekka Heinisuo
浏览文件
操作

Python 3.9 preparations

上级 2ce6d972
隐藏空白更改
内联 并排
Showing with 163 addition and 5 deletion
.travis.yml
浏览文件 @ 58f0105b
......@@ -133,6 +133,16 @@ jobs:
- TEST_DEPENDS=numpy==1.17.3
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.19.3
workspaces:
use: brew_cache
# headless builds for MacOS
- os: osx
......@@ -165,6 +175,16 @@ jobs:
- TEST_DEPENDS=numpy==1.17.3
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.19.3
workspaces:
use: brew_cache
# Contrib builds for MacOS
- os: osx
......@@ -197,6 +217,16 @@ jobs:
- TEST_DEPENDS=numpy==1.17.3
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.19.3
workspaces:
use: brew_cache
# headless contrib builds for MacOS
- os: osx
......@@ -229,6 +259,16 @@ jobs:
- TEST_DEPENDS=numpy==1.17.3
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.19.3
workspaces:
use: brew_cache
# default builds for Linux
- os: linux
......@@ -308,11 +348,23 @@ jobs:
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.8
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.19.3
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- PLAT=i686
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.17.3
- TEST_DEPENDS=numpy==1.19.3
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
......@@ -390,6 +442,30 @@ jobs:
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.19.3
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- PLAT=i686
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- TEST_DEPENDS=numpy==1.19.3
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
# contrib builds for Linux
- os: linux
......@@ -464,6 +540,30 @@ jobs:
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- TEST_DEPENDS=numpy==1.19.3
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- PLAT=i686
- TEST_DEPENDS=numpy==1.19.3
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
# headless contrib builds for Linux
......@@ -539,6 +639,30 @@ jobs:
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- TEST_DEPENDS=numpy==1.19.3
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.9
- PLAT=i686
- TEST_DEPENDS=numpy==1.19.3
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
# The first line is printed in the folding header in Travis output
before_install: |
......
appveyor.yml
浏览文件 @ 58f0105b
......@@ -30,6 +30,14 @@ environment:
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python39"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python39-x64"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
......@@ -54,6 +62,14 @@ environment:
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python39"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python39-x64"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
......@@ -78,6 +94,14 @@ environment:
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python39"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python39-x64"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
......@@ -102,6 +126,14 @@ environment:
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python39"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python39-x64"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
matrix:
fast_finish: true
......
multibuild @ 8882150d
比较 c2890dc8...8882150d
Subproject commit c2890dc8dc93f99b0eadd76f87aa181f6aea42da
Subproject commit 8882150df6529658700b66bec124dfb77eefca26
pyproject.toml
浏览文件 @ 58f0105b
[build-system]
requires = [
"setuptools", "wheel", "scikit-build", "cmake", "pip",
"numpy==1.11.3; python_version=='3.5'",
"numpy==1.13.3; python_version=='3.6'",
"numpy==1.14.5; python_version=='3.7'",
"numpy==1.17.3; python_version>='3.8'"
"numpy==1.17.3; python_version>='3.8'",
"numpy==1.19.3; python_version>='3.8'"
]
\ No newline at end of file
setup.py
浏览文件 @ 58f0105b
......@@ -235,9 +235,11 @@ def main():
"Operating System :: Unix",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: C++",
"Programming Language :: Python :: Implementation :: CPython",
"Topic :: Scientific/Engineering",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或