diff options
author | Jonathan Lange <jml@mumak.net> | 2013-01-26 15:36:52 +0000 |
---|---|---|
committer | Jonathan Lange <jml@mumak.net> | 2013-01-26 15:36:52 +0000 |
commit | b14f6e9dcd53fdd4b1e9574c7ceb8f19336d7d44 (patch) | |
tree | f31411414f3b6b04134b54eaa3378c20a1fb4e27 /setup.py | |
parent | 38ef751c9d6aa644037dc78b8f700e95b1a653d1 (diff) | |
download | testtools-b14f6e9dcd53fdd4b1e9574c7ceb8f19336d7d44.tar.gz |
Remove logic to get version from bzr revno
This is a regression, as now running `python setup.py sdist` on
trunk will no longer include the revno of the snapshot.
Diffstat (limited to 'setup.py')
-rwxr-xr-x | setup.py | 30 |
1 files changed, 4 insertions, 26 deletions
@@ -11,20 +11,6 @@ if getattr(testtools, 'TestCommand', None) is not None: cmd_class['test'] = testtools.TestCommand -def get_revno(): - try: - import bzrlib.errors - import bzrlib.workingtree - except ImportError: - return None - try: - t = bzrlib.workingtree.WorkingTree.open_containing(__file__)[0] - except (bzrlib.errors.NotBranchError, bzrlib.errors.NoWorkingTree): - return None - else: - return t.branch.revno() - - def get_version_from_pkg_info(): """Get the version from PKG-INFO file if we can.""" pkg_info_path = os.path.join(os.path.dirname(__file__), 'PKG-INFO') @@ -49,18 +35,10 @@ def get_version(): pkg_info_version = get_version_from_pkg_info() if pkg_info_version: return pkg_info_version - revno = get_revno() - if revno is None: - # Apparently if we just say "snapshot" then distribute won't accept it - # as satisfying versioned dependencies. This is a problem for the - # daily build version. - return "snapshot-%s" % (version,) - if phase == 'alpha': - # No idea what the next version will be - return 'next-r%s' % revno - else: - # Preserve the version number but give it a revno prefix - return version + '-r%s' % revno + # Apparently if we just say "snapshot" then distribute won't accept it + # as satisfying versioned dependencies. This is a problem for the + # daily build version. + return "snapshot-%s" % (version,) def get_long_description(): |