Skip to content

O
opencv-python

weixin_51672696 / opencv-python
与 Fork 源项目一致

Fork自 OpenCV / opencv-python

通知 1
Star 0
Fork 0
O
opencv-python

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

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

drop Python 3.5 support

上级 8dc0f4d8
显示空白变更内容
内联 并排
Showing with 6 addition and 150 deletion
.travis.yml
浏览文件 @ 928952d9
......@@ -103,15 +103,6 @@ jobs:
# default builds for MacOS
#further jobs in the list will use the same stage until the next assignment
- stage: final
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
......@@ -144,15 +135,6 @@ jobs:
use: brew_cache
# headless builds for MacOS
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
......@@ -185,15 +167,6 @@ jobs:
use: brew_cache
# Contrib builds for MacOS
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
......@@ -226,15 +199,6 @@ jobs:
use: brew_cache
# headless contrib builds for MacOS
- os: osx
language: generic
osx_image: xcode9.4
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
workspaces:
use: brew_cache
- os: osx
language: generic
osx_image: xcode9.4
......@@ -267,28 +231,6 @@ jobs:
use: brew_cache
# default builds for Linux
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- PLAT=i686
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=0
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
......@@ -361,30 +303,21 @@ jobs:
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
# headless builds for Linux
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- MB_PYTHON_VERSION=3.8
- PLAT=i686
- ENABLE_CONTRIB=0
- ENABLE_HEADLESS=1
- ENABLE_HEADLESS=0
- TEST_DEPENDS=numpy==1.17.3
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
# headless builds for Linux
- os: linux
language: generic
dist: xenial
......@@ -459,28 +392,6 @@ jobs:
directories: $HOME/.ccache
# contrib builds for Linux
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- PLAT=i686
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=0
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
......@@ -556,28 +467,6 @@ jobs:
# headless contrib builds for Linux
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
services: docker
env:
- MB_PYTHON_VERSION=3.5
- PLAT=i686
- ENABLE_CONTRIB=1
- ENABLE_HEADLESS=1
- USE_CCACHE=0
cache:
directories: $HOME/.ccache
- os: linux
language: generic
dist: xenial
......
appveyor.yml
浏览文件 @ 928952d9
......@@ -6,14 +6,6 @@ environment:
secure: 0bXSOVjf9x8L7nErTivu92TF1FwNosTjFJQPmxp8Dys=
matrix:
- PYTHON: "C:/Python35"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python35-x64"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
......@@ -38,14 +30,6 @@ environment:
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python35"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python35-x64"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
......@@ -70,14 +54,6 @@ environment:
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 0
- PYTHON: "C:/Python35"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python35-x64"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
......@@ -102,14 +78,6 @@ environment:
ENABLE_CONTRIB: 0
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python35"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python35-x64"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
- PYTHON: "C:/Python36"
ENABLE_CONTRIB: 1
ENABLE_HEADLESS: 1
......
setup.py
浏览文件 @ 928952d9
......@@ -220,7 +220,7 @@ def main():
maintainer="Olli-Pekka Heinisuo",
ext_modules=EmptyListWithLength(),
install_requires=numpy_version,
python_requires=">=3.5",
python_requires=">=3.6",
classifiers=[
"Development Status :: 5 - Production/Stable",
"Environment :: Console",
......@@ -235,7 +235,6 @@ def main():
"Operating System :: Unix",
"Programming Language :: Python",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或