pip installs fine!

[youtube-dl.git] / setup.py

diff --git a/setup.py b/setup.py
index 5dfbbc72dba47888081caa730f379c8965602e03..45ccf432e0bacacdda7d5d195330fd848906cf63 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,12 +1,11 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from __future__ import print_function
 from distutils.core import setup
 import pkg_resources
 import sys
 
-try:
-    import py2exe
-except ImportError:
-    print >> sys.stderr, "Cannot import py2exe"
-
 py2exe_options = {
     "bundle_files": 1,
     "compressed": 1,
@@ -16,28 +15,57 @@ py2exe_options = {
 }
 
 py2exe_console = [{
-    "script":"./youtube_dl/__main__.py",
+    "script": "./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 
-execfile('youtube_dl/version.py')
+try:
+    import py2exe
+    """This will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package"""
+    py2exe_params = {
+        'console': py2exe_console,
+        'options': { "py2exe": py2exe_options },
+        'zipfile': None
+    }
+except ImportError:
+    if 'py2exe' in sys.argv:
+        print("Cannot import py2exe", file=sys.stderr)
+        exit(1)
+    py2exe_params = {}
+
+# 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'))
 
 setup(
     name = 'youtube_dl',
     version = __version__,
-    description = 'Small command-line program to download videos from YouTube.com and other video sites',
+    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'],
 
-    test_suite = 'nose.collector',
-    test_requires = ['nosetest'],
-
-    console = py2exe_console,
-    options = { "py2exe": py2exe_options },
+    # Provokes warning on most systems (why?!)
+    #test_suite = 'nose.collector',
+    #test_requires = ['nosetest'],
 
     scripts = ['bin/youtube-dl'],
-    zipfile = None,
+    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']) ],
+
+    classifiers = [
+        "Topic :: Multimedia :: Video",
+        "Development Status :: 5 - Production/Stable",
+        "Environment :: Console",
+        "License :: Public Domain",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.3"
+    ],
+
+    **py2exe_params
 )