New test release.

[youtubedl] / setup.py

diff --git a/setup.py b/setup.py
index 6d019dcbb6e24a982611a2e26be1b62997bc2bf3..3b6dc2d40f0f551630dac1007aaf72e0af819724 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,19 @@
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function
 # -*- coding: utf-8 -*-
 
 from __future__ import print_function

-from distutils.core import setup
+

 import pkg_resources
 import sys
 
 try:
 import pkg_resources
 import sys
 
 try:

+    from setuptools import setup
+except ImportError:
+    from distutils.core import setup
+
+try:
+    # This will create an exe that needs Microsoft Visual C++ 2008
+    # Redistributable Package

     import py2exe
     import py2exe

-    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""

 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)
 except ImportError:
     if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
         print("Cannot import py2exe", file=sys.stderr)


@@ -19,15 +25,17 @@ py2exe_options = {
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',
     "compressed": 1,
     "optimize": 2,
     "dist_dir": '.',

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

 }
 }

+

 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 py2exe_console = [{
     "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]

+

 py2exe_params = {
     'console': py2exe_console,
 py2exe_params = {
     'console': py2exe_console,

-    'options': { "py2exe": py2exe_options },
+    'options': {"py2exe": py2exe_options},

     'zipfile': None
 }
 
     'zipfile': None
 }
 


@@ -36,30 +44,34 @@ if len(sys.argv) >= 2 and sys.argv[1] == 'py2exe':
 else:
     params = {
         'scripts': ['bin/youtube-dl'],
 else:
     params = {
         'scripts': ['bin/youtube-dl'],

-        'data_files': [('etc/bash_completion.d', ['youtube-dl.bash-completion']), # Installing system-wide would require sudo...
-                       ('share/doc/youtube_dl', ['README.txt']),
-                       ('share/man/man1/', ['youtube-dl.1'])]
+        'data_files': [  # Installing system-wide would require sudo...
+            ('etc/bash_completion.d', ['youtube-dl.bash-completion']),
+            ('share/doc/youtube_dl', ['README.txt']),
+            ('share/man/man1/', ['youtube-dl.1'])
+        ]

     }
 
 # Get the version from youtube_dl/version.py without importing the package
     }
 
 # Get the version from youtube_dl/version.py without importing the package

-exec(compile(open('youtube_dl/version.py').read(), 'youtube_dl/version.py', 'exec'))
+exec(compile(open('youtube_dl/version.py').read(),
+             'youtube_dl/version.py', 'exec'))

 
 setup(
 
 setup(

-    name = 'youtube_dl',
-    version = __version__,
-    description = 'YouTube video downloader',
-    long_description = 'Small command-line program to download videos from YouTube.com and other video sites.',
-    url = 'https://github.com/rg3/youtube-dl',
-    author = 'Ricardo Garcia',
-    maintainer = 'Philipp Hagemeister',
-    maintainer_email = 'phihag@phihag.de',
-    packages = ['youtube_dl'],
+    name='youtube_dl',
+    version=__version__,
+    description='YouTube video downloader',
+    long_description='Small command-line program to download videos from'
+    ' YouTube.com and other video sites.',
+    url='https://github.com/rg3/youtube-dl',
+    author='Ricardo Garcia',
+    maintainer='Philipp Hagemeister',
+    maintainer_email='phihag@phihag.de',
+    packages=['youtube_dl', 'youtube_dl.extractor'],

 
     # Provokes warning on most systems (why?!)
 
     # Provokes warning on most systems (why?!)

-    #test_suite = 'nose.collector',
-    #test_requires = ['nosetest'],
+    # test_suite = 'nose.collector',
+    # test_requires = ['nosetest'],

 
 

-    classifiers = [
+    classifiers=[

         "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",
         "Topic :: Multimedia :: Video",
         "Development Status :: 5 - Production/Stable",
         "Environment :: Console",