diff --git a/setup.py b/setup.py index 51c1efc..a505f0f 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # vi:si:et:sw=4:sts=4:ts=4 # encoding: utf-8 try: @@ -6,12 +6,12 @@ try: except: from distutils.core import setup -def get_bzr_version(): + +def get_version(): import os import re import subprocess dot_git = os.path.join(os.path.dirname(__file__), '.git') - info = os.path.join(os.path.dirname(__file__), '.bzr/branch/last-revision') changelog = os.path.join(os.path.dirname(__file__), 'debian/changelog') if os.path.exists(dot_git): cmd = ['git', 'rev-list', 'HEAD', '--count'] @@ -19,12 +19,6 @@ def get_bzr_version(): stdout, stderr = p.communicate() rev = int(stdout) return u'%s' % rev - elif os.path.exists(info): - f = open(info) - rev = int(f.read().split()[0]) - f.close() - if rev: - return u'%s' % rev elif os.path.exists(changelog): f = open(changelog) head = f.read().strip().split('\n')[0] @@ -34,9 +28,10 @@ def get_bzr_version(): return u"%s" % rev[0] return u'unknown' + setup( name="pandora_client", - version="0.2.%s" % get_bzr_version(), + version="0.2.%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",