diff --git a/setup.py b/setup.py index a505f0f..3e9d247 100644 --- a/setup.py +++ b/setup.py @@ -1,10 +1,5 @@ #!/usr/bin/env python3 -# vi:si:et:sw=4:sts=4:ts=4 -# encoding: utf-8 -try: - from setuptools import setup -except: - from distutils.core import setup +from setuptools import setup def get_version(): @@ -17,7 +12,7 @@ def get_version(): cmd = ['git', 'rev-list', 'HEAD', '--count'] p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, stderr = p.communicate() - rev = int(stdout) + rev = int(stdout) - 267 return u'%s' % rev elif os.path.exists(changelog): f = open(changelog) @@ -31,7 +26,7 @@ def get_version(): setup( name="pandora_client", - version="0.2.%s" % get_version(), + version="0.3.%s" % get_version(), description="pandora_client is a commandline client for pan.do/ra. You can use it to import videos into a pan.do/ra system. It is currently known to work on Linux and Mac OS X.", author="j", author_email="j@mailb.org", @@ -44,7 +39,7 @@ setup( 'pandora_client' ], install_requires=[ - 'ox >= 2.1.541,<3', + 'ox >= 2.3.804,<3', 'six', 'requests >= 1.1.0', 'zeroconf',