License file fix for opencv#34 (opencv#41)

glitchassassin · skvark · commit 253e0521ccc5 · 2017-07-22T15:13:02.000+03:00
* Moved license files to package_data

* Moved license files

* Copying licenses to cv2 in Travis step

* Added license copy to Windows build script
diff --git a/.travis.yml b/.travis.yml
@@ -212,6 +212,7 @@ before_install:
     - source multibuild/common_utils.sh
     - source multibuild/travis_steps.sh
     - python find_version.py
+    - cp LICENSE*.txt cv2/
     - before_install
 
 install:
diff --git a/appveyor/build.cmd b/appveyor/build.cmd
@@ -24,7 +24,7 @@ cd
 if %PYTHON_VERSION% GEQ 3 xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\%BUILD_DIR%\lib\python3\Release\*.pyd" .\cv2 /I
 if %PYTHON_VERSION% LSS 3 xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\%BUILD_DIR%\lib\RELEASE\*.pyd" .\cv2 /I
 xcopy "%APPVEYOR_BUILD_FOLDER%\opencv\%BUILD_DIR%\bin\Release\*.dll" .\cv2 /I
-
+xcopy "LICENSE*.txt" .\cv2 /I
 xcopy "%APPVEYOR_BUILD_FOLDER%\appveyor\setup.cfg" .\ /I
 
 dir
diff --git a/setup.py b/setup.py
@@ -48,6 +48,7 @@
 else:
     package_data['cv2'] = ['*.pyd', '*.dll']
 
+package_data['cv2'] += ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"]
 
 class BinaryDistribution(Distribution):
     """ Forces BinaryDistribution. """
@@ -68,7 +69,6 @@ def is_pure(self):
       package_data=package_data,
       maintainer="Olli-Pekka Heinisuo",
       include_package_data=True,
-      data_files=[("", ["LICENSE.txt", "LICENSE-3RD-PARTY.txt"])],
       install_requires="numpy>=%s" % numpy_version,
       classifiers=[
         'Development Status :: 5 - Production/Stable',
