diff options
| -rwxr-xr-x | bin/youtube-dl | 6 | ||||
| -rw-r--r-- | setup.py | 29 | ||||
| -rwxr-xr-x | youtube-dl | bin | 46327 -> 91 bytes |
3 files changed, 24 insertions, 11 deletions
diff --git a/bin/youtube-dl b/bin/youtube-dl new file mode 100755 index 000000000..fc3cc8ad8 --- /dev/null +++ b/bin/youtube-dl @@ -0,0 +1,6 @@ +#!/usr/bin/env python + +import youtube_dl + +if __name__ == '__main__': + youtube_dl.main() @@ -1,10 +1,9 @@ -from distutils.core import setup +from distutils.core import setup, Command import sys try: import py2exe except ImportError: sys.stderr.write("Cannot import py2exe") -import os import subprocess """The p2exe option will create an exe that needs Microsoft Visual C++ 2008 Redistributable Package. @@ -12,12 +11,16 @@ import subprocess 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") +#if len(sys.argv) == 1: +# sys.argv.append("py2exe") # os.chdir(os.path.dirname(os.path.abspath(sys.argv[0]))) # conflict with wine-py2exe.sh #sys.path.append('./youtube_dl') @@ -38,21 +41,25 @@ console = [{ 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, - description='Small command-line program to download videos from YouTube.com and other video sites', + 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'], - - console = console, - options = {"py2exe": options}, - zipfile = None, + #test suite + test_suite='nose.collector', + test_requires=['nosetest'], + console=console, + options={"py2exe": options}, + scripts=['bin/youtube-dl'], + zipfile=None, ) -import shutil -shutil.rmtree("build") +#import shutil +#shutil.rmtree("build") diff --git a/youtube-dl b/youtube-dl Binary files differindex ca4e467ff..fc3cc8ad8 100755 --- a/youtube-dl +++ b/youtube-dl |