diff --git a/attic/__init__.py b/attic/__init__.py index 18a78c124..69b15cf03 100644 --- a/attic/__init__.py +++ b/attic/__init__.py @@ -1,4 +1,4 @@ # This is a python package __version__ = '0.7' -__release__ = __version__ + 'dev' +__release__ = __version__ + '.dev' diff --git a/attic/archiver.py b/attic/archiver.py index a0ce2c40f..2badebd4d 100644 --- a/attic/archiver.py +++ b/attic/archiver.py @@ -6,14 +6,15 @@ import os import stat import sys -from .archive import Archive -from .repository import Repository -from .cache import Cache -from .key import key_creator -from .helpers import location_validator, format_time, \ +from attic import __release__ +from attic.archive import Archive +from attic.repository import Repository +from attic.cache import Cache +from attic.key import key_creator +from attic.helpers import location_validator, format_time, \ format_file_mode, IncludePattern, ExcludePattern, exclude_path, adjust_patterns, to_localtime, \ get_cache_dir, get_keys_dir, format_timedelta, prune_split, Manifest, Location, remove_surrogates -from .remote import RepositoryServer, RemoteRepository, ConnectionClosed +from attic.remote import RepositoryServer, RemoteRepository, ConnectionClosed class Archiver: @@ -342,8 +343,8 @@ class Archiver: default=False, help='verbose output') - parser = argparse.ArgumentParser(description='Attic - Deduplicated Backups') - subparsers = parser.add_subparsers(title='Available subcommands') + parser = argparse.ArgumentParser(description='Attic %s - Deduplicated Backups' % __release__) + subparsers = parser.add_subparsers(title='Available commands') subparser = subparsers.add_parser('serve', parents=[common_parser]) subparser.set_defaults(func=self.do_serve) diff --git a/setup.py b/setup.py index 430a17f5d..3e19ed27a 100644 --- a/setup.py +++ b/setup.py @@ -52,7 +52,7 @@ setup( version=attic.__release__, author='Jonas Borgström', author_email='jonas@borgstrom.se', - url='http://github.com/jborg/attic/', + url='https://pythonhosted.org/Attic/', description='Deduplicated backups', long_description=long_description, license='BSD',