Merge tag 'upstream/2015.11.10'

[youtubedl] / setup.py

diff --git a/setup.py b/setup.py
index 03e7b358e4ec1b4800e06f6796e386a808b67891..bfe931f5b42a506ca3cceb1a5ec4acdb6a6a4813 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,6 @@
 from __future__ import print_function
 
 import os.path
 from __future__ import print_function
 
 import os.path

-import pkg_resources

 import warnings
 import sys
 
 import warnings
 import sys
 


@@ -29,7 +28,7 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',

-    "dll_excludes": ['w9xpopen.exe'],
+    "dll_excludes": ['w9xpopen.exe', 'crypt32.dll'],

 }
 
 py2exe_console = [{
 }
 
 py2exe_console = [{


@@ -48,6 +47,7 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
 else:
     files_spec = [
         ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
 else:
     files_spec = [
         ('etc/bash_completion.d', ['youtube-dl.bash-completion']),

+        ('etc/fish/completions', ['youtube-dl.fish']),

         ('share/doc/youtube_dl', ['README.txt']),
         ('share/man/man1', ['youtube-dl.1'])
     ]
         ('share/doc/youtube_dl', ['README.txt']),
         ('share/man/man1', ['youtube-dl.1'])
     ]


@@ -102,7 +102,9 @@ setup(
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",

-        "Programming Language :: Python :: 3.3"
+        "Programming Language :: Python :: 3.2",
+        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",

     ],
 
     **params
     ],
 
     **params