prismdata
diff --git a/‎docker/README.md
Copy file name to clipboard
+4-7Lines changed: 4 additions & 7 deletions b/‎docker/README.md
Copy file name to clipboard
+4-7Lines changed: 4 additions & 7 deletions
diff --git a/‎docker/manylinux2014/Dockerfile_i686
Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_i686
+1-1Lines changed: 1 addition & 1 deletion b/‎docker/manylinux2014/Dockerfile_i686
Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_i686
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎docker/manylinux2014/Dockerfile_x86_64
Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_x86_64
+1-1Lines changed: 1 addition & 1 deletion b/‎docker/manylinux2014/Dockerfile_x86_64
Copy file name to clipboardExpand all lines: docker/manylinux2014/Dockerfile_x86_64
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎setup.py
Copy file name to clipboardExpand all lines: setup.py
+10-35Lines changed: 10 additions & 35 deletions b/‎setup.py
Copy file name to clipboardExpand all lines: setup.py
+10-35Lines changed: 10 additions & 35 deletions
@@ -1,12 +1,9 @@
 ### Customized manylinux images for opencv-python
 
-This folder includes Dockerfiles for extending both ``i686`` and ``x86_64`` manylinux images.
+The subfolders include Dockerfiles for extending both ``i686`` and ``x86_64`` manylinux1 and manylinux2014 images.
 
-The extended images were created to be able to build OpenCV in reasonable time with Travis. The images are hosted at https://quay.io/user/skvark.
+Manylinux2014 is used in wheels with version 3.4.10.* / 4.3.0.* and above. 
 
-The images have following extra software installed:
+The extended images were created to be able to build OpenCV in reasonable time with Travis. The images are hosted at https://quay.io/user/skvark.
 
-- Qt 4.8.7
-- Cmake 3.9.0
-- FFmpeg with libvpx (latest snapshots at the build time) and recent openssl + other FFmpeg dependencies built from sources
-- Some missing headers included from more recent Linux to be able to enable V4L / V4L2 support in OpenCV
+See the dockerfiles for more info.
@@ -1,6 +1,6 @@
 FROM quay.io/pypa/manylinux2014_i686:latest
 
-RUN yum install freetype-devel bzip2-devel curl-devel qt5-qtbase-devel lapack-devel -y
+RUN yum install freetype-devel bzip2-devel curl-devel qt5-qtbase-devel blas-devel lapack-devel atlas-devel -y
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
 
@@ -1,6 +1,6 @@
 FROM quay.io/pypa/manylinux2014_x86_64:latest
 
-RUN yum install freetype-devel bzip2-devel curl-devel qt5-qtbase-devel lapack-devel -y
+RUN yum install freetype-devel bzip2-devel curl-devel qt5-qtbase-devel blas-devel lapack-devel atlas-devel -y
 
 RUN mkdir ~/ffmpeg_sources && \
     cd ~/ffmpeg_sources && \
 
@@ -34,7 +34,13 @@ def main():
     numpy_version = get_or_install("numpy", minimum_supported_numpy)
     get_or_install("scikit-build")
     get_or_install("cmake")
+
     import skbuild
+    from skbuild import cmaker
+
+    python_version = cmaker.CMaker.get_python_version()
+    python_lib_path = cmaker.CMaker.get_python_library(python_version)
+    python_include_dir = cmaker.CMaker.get_python_include_dir(python_version)
 
     if os.path.exists(".git"):
 
@@ -109,7 +115,8 @@ def main():
         + [
             # skbuild inserts PYTHON_* vars. That doesn't satisfy opencv build scripts in case of Py3
             "-DPYTHON_DEFAULT_EXECUTABLE=%s" % sys.executable,
-            "-DPYTHON3_INCLUDE_DIR=%s" % sysconfig.get_paths()["include"],
+            "-DPYTHON3_INCLUDE_DIR=%s" % python_include_dir,
+            "-DPYTHON3_LIBRARY=%s" % python_lib_path,
             "-DBUILD_opencv_python3=ON",
             "-DBUILD_opencv_python2=OFF",
             # When off, adds __init__.py and a few more helper .py's. We use our own helper files with a different structure.
@@ -127,27 +134,6 @@ def main():
             "-DBUILD_PERF_TESTS=OFF",
             "-DBUILD_DOCS=OFF",
         ]
-        + (
-            [
-                "-DPYTHON3_LIBRARY=%s"
-                % os.path.join(
-                    *[
-                        sysconfig.get_config_var("BINDIR"),
-                        "libs",
-                        "python{}.lib".format(
-                            "".join(str(v) for v in sys.version_info[:2])
-                        ),
-                    ]
-                )
-            ]
-            if sys.platform.startswith("win")
-            else [
-                "-DPYTHON3_LIBRARY=%s"
-                % os.path.join(
-                    "/usr/lib/x86_64-linux-gnu/", sysconfig.get_config_var("LDLIBRARY")
-                )
-            ]
-        )
         + (
             ["-DOPENCV_EXTRA_MODULES_PATH=" + os.path.abspath("opencv_contrib/modules")]
             if build_contrib
@@ -178,9 +164,10 @@ def main():
 
     if sys.platform.startswith("linux"):
         cmake_args.append("-DWITH_V4L=ON")
+        cmake_args.append("-DWITH_LAPACK=ON")
         cmake_args.append("-DENABLE_PRECOMPILED_HEADERS=OFF")
 
-    if sys.platform.startswith('linux') and not x64:
+    if sys.platform.startswith("linux") and not x64:
         subprocess.check_call("patch -p0 < patches/patchOpenEXR", shell=True)
 
     # Fixes for macOS builds
@@ -190,21 +177,9 @@ def main():
 
     if "CMAKE_ARGS" in os.environ:
         import shlex
-
         cmake_args.extend(shlex.split(os.environ["CMAKE_ARGS"]))
         del shlex
 
-    # ABI config variables are introduced in PEP 425
-    if sys.version_info[:2] < (3, 2):
-        import warnings
-
-        warnings.filterwarnings(
-            "ignore",
-            r"Config variable '[^']+' is unset, " r"Python ABI tag may be incorrect",
-            category=RuntimeWarning,
-        )
-        del warnings
-
     # works via side effect
     RearrangeCMakeOutput(
         rearrange_cmake_output_data, files_outside_package_dir, package_data.keys()