X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=setup.py;h=ba051f7deb0216d5c7aaa36091a5d10d9037b38c;hb=2f1765c4eaeeee58c1711aaf5757c1fb731c7f9b;hp=ec63beddedd9bd5a0ec3d8bbfea4cce53dfa6c4c;hpb=8192ebe1f874b22b0c27e675a4136a06e46a68ce;p=youtube-dl

diff --git a/setup.py b/setup.py
index ec63bedde..ba051f7de 100644
--- a/setup.py
+++ b/setup.py
@@ -1,31 +1,17 @@
-from distutils.core import setup, Command
+#!/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:
-    sys.stderr.write("Cannot import py2exe")
-import subprocess
-
-"""The p2exe option will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package.
-    python setup.py py2exe
-   You can also build a zip executable with
-    python setup.py bdist --format=zip
-
-   The test suite can be run with
-    python setup.py test
-
-
-    The actual version is defined by the last git tag
-"""
-
-# If run without args, build executables
-#if len(sys.argv) == 1:
-#    sys.argv.append("py2exe")
+    print("Cannot import py2exe", file=sys.stderr)
 
-# os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh
-#sys.path.append('./youtube_dl')
-
-options = {
+py2exe_options = {
     "bundle_files": 1,
     "compressed": 1,
     "optimize": 2,
@@ -33,33 +19,40 @@ options = {
     "dll_excludes": ['w9xpopen.exe']
 }
 
-console = [{
+py2exe_console = [{
     "script":"./youtube_dl/__main__.py",
     "dest_base": "youtube-dl",
 }]
 
-init_file = open('./youtube_dl/__init__.py')
-
-try:
-    #return the last tag name
-    version = subprocess.checkoutput(["git", "describe", "--abbrev=0", "--tags"])
-except:
-    version = ''
-
-setup(name='youtube-dl',
-      version=version,
-      long_description='Small command-line program to download videos from YouTube.com and other video sites',
-      url='https://github.com/rg3/youtube-dl',
-      packages=['youtube_dl'],
-      #test suite
-      test_suite='nose.collector',
-      test_requires=['nosetest'],
-      console=console,
-      options={"py2exe": options},
-      scripts=['bin/youtube-dl'],
-      zipfile=None,
+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',
+    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 },
+
+    scripts = ['bin/youtube-dl'],
+    zipfile = None,
+
+    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"
+    ]
 )
-
-#import shutil
-#shutil.rmtree("build")
-