update 3.4 from master

Author: skvark

.travis.yml

@@ -134,7 +134,7 @@ Linux and MacOS wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) l
 
 ### Releases
 
-A release is made and uploaded to PyPI when a new tag is pushed to the repo. These tags differentiate packages (this repo might have modifications but OpenCV version stays same) and should be incremented sequentially. In practice, release version numbers look like this:
+A release is made and uploaded to PyPI when a new tag is pushed to master branch. These tags differentiate packages (this repo might have modifications but OpenCV version stays same) and should be incremented sequentially. In practice, release version numbers look like this:
 
 ``cv_major.cv_minor.cv_revision.package_revision`` e.g. ``3.1.0.0``
 
@@ -158,12 +158,12 @@ The default ``manylinux`` images have been extended with some OpenCV dependencie
 
 Python 2.7 is the only supported version in 2.x series. Python 2.7 support will be dropped in the end of 2019.
 
-Python 3.x releases follow Numpy releases. For example Python 3.3 is no longer supported by Numpy so support for it has been dropped in ``opencv-python``, too.
+Python 3.x releases are provided for officially supported versions (not in EOL).
 
 Currently, builds for following Python versions are provided:
 
 - 2.7
-- 3.4
 - 3.5
 - 3.6
 - 3.7
+- 3.8

README.md

@@ -14,14 +14,6 @@ environment:
       ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python34"
-      ENABLE_CONTRIB: 0
-      ENABLE_HEADLESS: 0
-
-    - PYTHON: "C:/Python34-x64"
-      ENABLE_CONTRIB: 0
-      ENABLE_HEADLESS: 0
-
     - PYTHON: "C:/Python35"
       ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 0
@@ -46,19 +38,19 @@ environment:
       ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python27"
-      ENABLE_CONTRIB: 1
+    - PYTHON: "C:/Python38"
+      ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python27-x64"
-      ENABLE_CONTRIB: 1
+    - PYTHON: "C:/Python38-x64"
+      ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python27"
       ENABLE_CONTRIB: 1
       ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python34-x64"
+    - PYTHON: "C:/Python27-x64"
       ENABLE_CONTRIB: 1
       ENABLE_HEADLESS: 0
 
@@ -86,19 +78,19 @@ environment:
       ENABLE_CONTRIB: 1
       ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python27"
-      ENABLE_CONTRIB: 0
-      ENABLE_HEADLESS: 1
+    - PYTHON: "C:/Python38"
+      ENABLE_CONTRIB: 1
+      ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python27-x64"
-      ENABLE_CONTRIB: 0
-      ENABLE_HEADLESS: 1
+    - PYTHON: "C:/Python38-x64"
+      ENABLE_CONTRIB: 1
+      ENABLE_HEADLESS: 0
 
-    - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python27"
       ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 1
 
-    - PYTHON: "C:/Python34-x64"
+    - PYTHON: "C:/Python27-x64"
       ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 1
 
@@ -126,19 +118,19 @@ environment:
       ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 1
 
-    - PYTHON: "C:/Python27"
-      ENABLE_CONTRIB: 1
+    - PYTHON: "C:/Python38"
+      ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 1
 
-    - PYTHON: "C:/Python27-x64"
-      ENABLE_CONTRIB: 1
+    - PYTHON: "C:/Python38-x64"
+      ENABLE_CONTRIB: 0
       ENABLE_HEADLESS: 1
 
-    - PYTHON: "C:/Python34"
+    - PYTHON: "C:/Python27"
       ENABLE_CONTRIB: 1
       ENABLE_HEADLESS: 1
 
-    - PYTHON: "C:/Python34-x64"
+    - PYTHON: "C:/Python27-x64"
       ENABLE_CONTRIB: 1
       ENABLE_HEADLESS: 1
 
@@ -166,6 +158,14 @@ environment:
       ENABLE_CONTRIB: 1
       ENABLE_HEADLESS: 1
 
+    - PYTHON: "C:/Python38"
+      ENABLE_CONTRIB: 1
+      ENABLE_HEADLESS: 1
+
+    - PYTHON: "C:/Python38-x64"
+      ENABLE_CONTRIB: 1
+      ENABLE_HEADLESS: 1
+
 matrix:
     fast_finish: true
 

appveyor.yml

@@ -28,6 +28,8 @@ def main():
         minimum_supported_numpy = "1.11.3"
     if sys.version_info[:2] >= (3, 7):
         minimum_supported_numpy = "1.14.5"
+    if sys.version_info[:2] >= (3, 8):
+        minimum_supported_numpy = "1.17.3"
 
     numpy_version = get_or_install("numpy", minimum_supported_numpy)
     get_or_install("scikit-build")
@@ -76,14 +78,14 @@ def main():
     # Path regexes with forward slashes relative to CMake install dir.
     rearrange_cmake_output_data = {
 
-        'cv2': ([r'bin/opencv_ffmpeg\d{3}%s\.dll' % ('_64' if x64 else '')] if os.name == 'nt' else []) +
+        'cv2': ([r'bin/opencv_videoio_ffmpeg\d{3}%s\.dll' % ('_64' if x64 else '')] if os.name == 'nt' else []) +
         # In Windows, in python/X.Y/<arch>/; in Linux, in just python/X.Y/.
         # Naming conventions vary so widely between versions and OSes
         # had to give up on checking them.
         ['python/cv2[^/]*%(ext)s' % {'ext': re.escape(sysconfig.get_config_var('SO'))}],
 
         'cv2.data': [  # OPENCV_OTHER_INSTALL_PATH
-            ('etc' if os.name == 'nt' else 'share/OpenCV') +
+            ('etc' if os.name == 'nt' else 'share/opencv4') +
             r'/haarcascades/.*\.xml'
         ]
     }
@@ -138,7 +140,7 @@ def main():
         cmake_args.append("-DWITH_LAPACK=OFF")  # Some OSX LAPACK fns are incompatible, see
                                                 # https://github.com/skvark/opencv-python/issues/21
         cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++")
-        cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.8")
+        cmake_args.append("-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.9")
 
     if sys.platform == 'darwin' and build_contrib:
         cmake_args.append("-DCMAKE_CXX_FLAGS=-stdlib=libc++ -std=c++11 -Wno-c++11-narrowing")
@@ -201,10 +203,10 @@ def main():
           'Programming Language :: Python :: 2',
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
-          'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: 3.5',
           'Programming Language :: Python :: 3.6',
           'Programming Language :: Python :: 3.7',
+          'Programming Language :: Python :: 3.8',
           'Programming Language :: C++',
           'Programming Language :: Python :: Implementation :: CPython',
           'Topic :: Scientific/Engineering',

multibuild

@@ -64,8 +64,8 @@ if [ -n "$IS_OSX" ]; then
                 if (!$found_blank && /^$/) {$_.="conflicts_with \"ffmpeg\"\n\n"; $found_blank=1; next;}
                 if (!$bottle_block && /^\s*bottle do$/) { $bottle_block=1; next; }
                 if ($bottle_block) { if (/^\s*end\s*$/) { $bottle_block=0} elsif (/^\s*sha256\s/) {$_=""} next; }
-if (/^\s*depends_on "(x264|x265|xvid|frei0r|rubberband)"$/) {$_=""; next;}
-                if (/^\s*--enable-(gpl|libx264|libx265|libxvid|frei0r|librubberband)$/) {$_=""; next;}
+if (/^\s*depends_on "(x264|x265|xvid|frei0r|rubberband|libvidstab)"$/) {$_=""; next;}
+                if (/^\s*--enable-(gpl|libx264|libx265|libxvid|frei0r|librubberband|libvidstab)$/) {$_=""; next;}
                 ' <"$FF_FORMULA" >"$LFF_FORMULA"
             diff -u "$FF_FORMULA" "$LFF_FORMULA" || test $? -le 1
 
@@ -86,7 +86,7 @@ function pre_build {
 
   if [ -n "$IS_OSX" ]; then
     echo "Running for OSX"
-    
+
     local CACHE_STAGE; (echo "$TRAVIS_BUILD_STAGE_NAME" | grep -qiF "final") || CACHE_STAGE=1
 
     #after the cache stage, all bottles and Homebrew metadata should be already cached locally
@@ -117,7 +117,7 @@ function pre_build {
         brew_go_bootstrap_mode 0
         return 0
     fi
-    
+
     # Have to install macpython late to avoid conflict with Homebrew Python update
     before_install