Content-Length: 816992 | pFad | http://github.com/opencv/opencv-python/commit/f9934e2b041508445d4b329a244378d5dadc1242

15 Merge branch 'feat/python39' into 3.4 · opencv/opencv-python@f9934e2 · GitHub
Skip to content

Commit f9934e2

Browse files
skvarkskvark
committed
Merge branch 'feat/python39' into 3.4
2 parents 22086f8 + 5e46e96 commit f9934e2

File tree

5 files changed

+163
-5
lines changed

5 files changed

+163
-5
lines changed

‎.travis.yml

+126-2
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,16 @@ jobs:
133133
- TEST_DEPENDS=numpy==1.17.3
134134
workspaces:
135135
use: brew_cache
136+
- os: osx
137+
language: generic
138+
osx_image: xcode9.4
139+
env:
140+
- MB_PYTHON_VERSION=3.9
141+
- ENABLE_CONTRIB=0
142+
- ENABLE_HEADLESS=0
143+
- TEST_DEPENDS=numpy==1.19.3
144+
workspaces:
145+
use: brew_cache
136146

137147
# headless builds for MacOS
138148
- os: osx
@@ -165,6 +175,16 @@ jobs:
165175
- TEST_DEPENDS=numpy==1.17.3
166176
workspaces:
167177
use: brew_cache
178+
- os: osx
179+
language: generic
180+
osx_image: xcode9.4
181+
env:
182+
- MB_PYTHON_VERSION=3.9
183+
- ENABLE_CONTRIB=0
184+
- ENABLE_HEADLESS=1
185+
- TEST_DEPENDS=numpy==1.19.3
186+
workspaces:
187+
use: brew_cache
168188

169189
# Contrib builds for MacOS
170190
- os: osx
@@ -197,6 +217,16 @@ jobs:
197217
- TEST_DEPENDS=numpy==1.17.3
198218
workspaces:
199219
use: brew_cache
220+
- os: osx
221+
language: generic
222+
osx_image: xcode9.4
223+
env:
224+
- MB_PYTHON_VERSION=3.9
225+
- ENABLE_CONTRIB=1
226+
- ENABLE_HEADLESS=0
227+
- TEST_DEPENDS=numpy==1.19.3
228+
workspaces:
229+
use: brew_cache
200230

201231
# headless contrib builds for MacOS
202232
- os: osx
@@ -229,6 +259,16 @@ jobs:
229259
- TEST_DEPENDS=numpy==1.17.3
230260
workspaces:
231261
use: brew_cache
262+
- os: osx
263+
language: generic
264+
osx_image: xcode9.4
265+
env:
266+
- MB_PYTHON_VERSION=3.9
267+
- ENABLE_CONTRIB=1
268+
- ENABLE_HEADLESS=1
269+
- TEST_DEPENDS=numpy==1.19.3
270+
workspaces:
271+
use: brew_cache
232272

233273
# default builds for Linux
234274
- os: linux
@@ -308,11 +348,23 @@ jobs:
308348
dist: xenial
309349
services: docker
310350
env:
311-
- MB_PYTHON_VERSION=3.8
351+
- MB_PYTHON_VERSION=3.9
352+
- ENABLE_CONTRIB=0
353+
- ENABLE_HEADLESS=0
354+
- TEST_DEPENDS=numpy==1.19.3
355+
- USE_CCACHE=0
356+
cache:
357+
directories: $HOME/.ccache
358+
- os: linux
359+
language: generic
360+
dist: xenial
361+
services: docker
362+
env:
363+
- MB_PYTHON_VERSION=3.9
312364
- PLAT=i686
313365
- ENABLE_CONTRIB=0
314366
- ENABLE_HEADLESS=0
315-
- TEST_DEPENDS=numpy==1.17.3
367+
- TEST_DEPENDS=numpy==1.19.3
316368
- USE_CCACHE=0
317369
cache:
318370
directories: $HOME/.ccache
@@ -390,6 +442,30 @@ jobs:
390442
- USE_CCACHE=0
391443
cache:
392444
directories: $HOME/.ccache
445+
- os: linux
446+
language: generic
447+
dist: xenial
448+
services: docker
449+
env:
450+
- MB_PYTHON_VERSION=3.9
451+
- ENABLE_CONTRIB=0
452+
- ENABLE_HEADLESS=1
453+
- TEST_DEPENDS=numpy==1.19.3
454+
cache:
455+
directories: $HOME/.ccache
456+
- os: linux
457+
language: generic
458+
dist: xenial
459+
services: docker
460+
env:
461+
- MB_PYTHON_VERSION=3.9
462+
- PLAT=i686
463+
- ENABLE_CONTRIB=0
464+
- ENABLE_HEADLESS=1
465+
- TEST_DEPENDS=numpy==1.19.3
466+
- USE_CCACHE=0
467+
cache:
468+
directories: $HOME/.ccache
393469

394470
# contrib builds for Linux
395471
- os: linux
@@ -464,6 +540,30 @@ jobs:
464540
- USE_CCACHE=0
465541
cache:
466542
directories: $HOME/.ccache
543+
- os: linux
544+
language: generic
545+
dist: xenial
546+
services: docker
547+
env:
548+
- MB_PYTHON_VERSION=3.9
549+
- TEST_DEPENDS=numpy==1.19.3
550+
- ENABLE_CONTRIB=1
551+
- ENABLE_HEADLESS=0
552+
cache:
553+
directories: $HOME/.ccache
554+
- os: linux
555+
language: generic
556+
dist: xenial
557+
services: docker
558+
env:
559+
- MB_PYTHON_VERSION=3.9
560+
- PLAT=i686
561+
- TEST_DEPENDS=numpy==1.19.3
562+
- ENABLE_CONTRIB=1
563+
- ENABLE_HEADLESS=0
564+
- USE_CCACHE=0
565+
cache:
566+
directories: $HOME/.ccache
467567

468568

469569
# headless contrib builds for Linux
@@ -539,6 +639,30 @@ jobs:
539639
- USE_CCACHE=0
540640
cache:
541641
directories: $HOME/.ccache
642+
- os: linux
643+
language: generic
644+
dist: xenial
645+
services: docker
646+
env:
647+
- MB_PYTHON_VERSION=3.9
648+
- TEST_DEPENDS=numpy==1.19.3
649+
- ENABLE_CONTRIB=1
650+
- ENABLE_HEADLESS=1
651+
cache:
652+
directories: $HOME/.ccache
653+
- os: linux
654+
language: generic
655+
dist: xenial
656+
services: docker
657+
env:
658+
- MB_PYTHON_VERSION=3.9
659+
- PLAT=i686
660+
- TEST_DEPENDS=numpy==1.19.3
661+
- ENABLE_CONTRIB=1
662+
- ENABLE_HEADLESS=1
663+
- USE_CCACHE=0
664+
cache:
665+
directories: $HOME/.ccache
542666

543667
# The first line is printed in the folding header in Travis output
544668
before_install: |

‎appveyor.yml

+32
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,14 @@ environment:
3030
ENABLE_CONTRIB: 0
3131
ENABLE_HEADLESS: 0
3232

33+
- PYTHON: "C:/Python39"
34+
ENABLE_CONTRIB: 0
35+
ENABLE_HEADLESS: 0
36+
37+
- PYTHON: "C:/Python39-x64"
38+
ENABLE_CONTRIB: 0
39+
ENABLE_HEADLESS: 0
40+
3341
- PYTHON: "C:/Python36"
3442
ENABLE_CONTRIB: 1
3543
ENABLE_HEADLESS: 0
@@ -54,6 +62,14 @@ environment:
5462
ENABLE_CONTRIB: 1
5563
ENABLE_HEADLESS: 0
5664

65+
- PYTHON: "C:/Python39"
66+
ENABLE_CONTRIB: 1
67+
ENABLE_HEADLESS: 0
68+
69+
- PYTHON: "C:/Python39-x64"
70+
ENABLE_CONTRIB: 1
71+
ENABLE_HEADLESS: 0
72+
5773
- PYTHON: "C:/Python36"
5874
ENABLE_CONTRIB: 0
5975
ENABLE_HEADLESS: 1
@@ -78,6 +94,14 @@ environment:
7894
ENABLE_CONTRIB: 0
7995
ENABLE_HEADLESS: 1
8096

97+
- PYTHON: "C:/Python39"
98+
ENABLE_CONTRIB: 0
99+
ENABLE_HEADLESS: 1
100+
101+
- PYTHON: "C:/Python39-x64"
102+
ENABLE_CONTRIB: 0
103+
ENABLE_HEADLESS: 1
104+
81105
- PYTHON: "C:/Python36"
82106
ENABLE_CONTRIB: 1
83107
ENABLE_HEADLESS: 1
@@ -102,6 +126,14 @@ environment:
102126
ENABLE_CONTRIB: 1
103127
ENABLE_HEADLESS: 1
104128

129+
- PYTHON: "C:/Python39"
130+
ENABLE_CONTRIB: 1
131+
ENABLE_HEADLESS: 1
132+
133+
- PYTHON: "C:/Python39-x64"
134+
ENABLE_CONTRIB: 1
135+
ENABLE_HEADLESS: 1
136+
105137
matrix:
106138
fast_finish: true
107139

‎multibuild

‎pyproject.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[build-system]
22
requires = [
33
"setuptools", "wheel", "scikit-build", "cmake", "pip",
4-
"numpy==1.11.3; python_version=='3.5'",
54
"numpy==1.13.3; python_version=='3.6'",
65
"numpy==1.14.5; python_version=='3.7'",
7-
"numpy==1.17.3; python_version>='3.8'"
6+
"numpy==1.17.3; python_version=='3.8'",
7+
"numpy==1.19.3; python_version>='3.9'"
88
]

‎setup.py

+2
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,11 @@ def main():
235235
"Operating System :: Unix",
236236
"Programming Language :: Python",
237237
"Programming Language :: Python :: 3",
238+
"Programming Language :: Python :: 3 :: Only",
238239
"Programming Language :: Python :: 3.6",
239240
"Programming Language :: Python :: 3.7",
240241
"Programming Language :: Python :: 3.8",
242+
"Programming Language :: Python :: 3.9",
241243
"Programming Language :: C++",
242244
"Programming Language :: Python :: Implementation :: CPython",
243245
"Topic :: Scientific/Engineering",

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/opencv/opencv-python/commit/f9934e2b041508445d4b329a244378d5dadc1242

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy