Copy (ffmpeg) .dll to fix #6 (#15)

* Copy (ffmpeg) .dll to fix #6

This attempts to copy all .dll files in build directory,
where should be only ffmpeg .dll

* Update appveyor.yml

Use literal style block to avoid unnecessary blank lines
http://stackoverflow.com/questions/3790454/in-yaml-how-do-i-break-a-string-over-multiple-lines/21699210#21699210

* Update appveyor.yml

Fix source dir for ffmpeg .dlls

* Update setup.py

Include ffmpeg .dll into wheel

* update README, licensing, fix dll copying, add video test

* fix indentation

* disable test for now to get artifacts

* Add FFmpeg license, inject cv2 to PATH in __init__, enable video test

* disable video test on other OS

Author: techtonik

LICENSE-3RD-PARTY.txt

@@ -70,10 +70,14 @@ Licensing
 ---------
 
 Opencv-python package (scripts in this repository) is available under
-MIT license. The OpenCV itself is available under `3-clause BSD
+MIT license. 
+
+OpenCV itself is available under `3-clause BSD
 License <https://github.com/opencv/opencv/blob/master/LICENSE>`__
 (`LICENSE-3RD-PARTY.txt <https://github.com/skvark/opencv-python/blob/master/LICENSE-3RD-PARTY.txt>`__).
 
+This software uses code of `FFmpeg <http://ffmpeg.org>`__ licensed under the `LGPLv2.1 <http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html>`__.
+
 Versioning
 ----------
 
@@ -137,4 +141,4 @@ supported by the manylinux containers.
 OS X
 ~~~~
 
-Currently built for Python 2.7 and 3.4.
+Currently built for Python 2.7, 3.4 and 3.5.

README.rst

@@ -29,7 +29,7 @@ install:
     C:\Python35-x64\python.exe -m pip install -r requirements.txt
 
 build_script:
-- cmd: >-
+- cmd: |-
 
     if not exist "%APPVEYOR_BUILD_FOLDER%\opencv\build" mkdir "%APPVEYOR_BUILD_FOLDER%\opencv\build"
 
@@ -52,36 +52,46 @@ build_script:
     cmake --build . --config Release
 
     cd ..\..
-
+    cd
     xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build\lib\RELEASE\*.pyd" cv2
+    xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build\bin\Release\*.dll" cv2
+    del cv2\*64.dll
 
     C:\Python27\python.exe setup.py bdist_wheel
 
     del cv2\*.pyd
+    del cv2\*.dll
 
     rmdir "%APPVEYOR_BUILD_FOLDER%\build" /s /q
 
     xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build64\lib\RELEASE\*.pyd" cv2
+    xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build64\bin\Release\*64.dll" cv2
 
     C:\Python27-x64\python.exe setup.py bdist_wheel
 
     del cv2\*.pyd
+    del cv2\*.dll
 
     rmdir "%APPVEYOR_BUILD_FOLDER%\build" /s /q
 
     xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build\lib\python3\Release\*.pyd" cv2
+    xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build\bin\Release\*.dll" cv2
+    del cv2\*64.dll
 
     C:\Python35\python.exe setup.py bdist_wheel
 
     del cv2\*.pyd
+    del cv2\*.dll
 
     rmdir "%APPVEYOR_BUILD_FOLDER%\build" /s /q
 
     xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build64\lib\python3\Release\*.pyd" cv2
+    xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\build64\bin\Release\*64.dll" cv2
 
     C:\Python35-x64\python.exe setup.py bdist_wheel
 
     del cv2\*.pyd
+    del cv2\*.dll
     
     rmdir "%APPVEYOR_BUILD_FOLDER%\build" /s /q
 

appveyor.yml

@@ -1,3 +1,8 @@
 import sys
+import os
+
+# FFMPEG dll is not found on Windows without this
+os.environ["PATH"] += os.pathsep + os.path.dirname(os.path.realpath(__file__))
+
 from . import cv2
 sys.modules['cv2'] = cv2

cv2/__init__.py

@@ -33,7 +33,7 @@ def is_pure(self):
 if os.name == 'posix':
     package_data['cv2'] = ['*.so']
 else:
-    package_data['cv2'] = ['*.pyd']
+    package_data['cv2'] = ['*.pyd', '*.dll']
 
 setup(name='opencv-python',
       version=opencv_version,

setup.py

@@ -1,8 +1,17 @@
 import unittest
+import os
 
 class OpenCVTest(unittest.TestCase):
     """ Simple functionality tests. """
 
     def test_import(self):
         """ Test that the cv2 module can be imported. """
-        import cv2
+        import cv2
+
+    def test_video_capture(self):
+
+        if os.name != 'posix':
+            import cv2
+
+            cap = cv2.VideoCapture("SampleVideo_1280x720_1mb.mp4")
+            self.assertTrue(cap.isOpened())