Make some clean

ZuluPro · Jul 25, 2015 · ab0f43b · ab0f43b
1 parent b64552b
commit ab0f43b
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 89 deletions.
diff --git a/2to3.patch b/2to3.patch
diff --git a/README.rst b/README.rst
@@ -8,19 +8,37 @@ Django Database Backup
         :target: https://readthedocs.org/projects/django-dbbackup/?badge=latest
         :alt: Documentation Status
 
-
 .. image:: https://coveralls.io/repos/django-dbbackup/django-dbbackup/badge.svg?branch=master&service=github
         :target: https://coveralls.io/github/django-dbbackup/django-dbbackup?branch=master
 
 
 This Django application provides management commands to help backup and
-restore your project database to AmazonS3, Dropbox or Local Disk.
+restore your project database and media files with various storages such as
+Amazon S3, DropBox or local file storage.
+
+It is made for:
 
--  Keep your important data secure and offsite.
+-  Ensure yours backup with GPG signature and encryption
+-  Archive with compression
 -  Use Crontab or Celery to setup automated backups.
 -  Great to keep your development database up to date.
 
 Docs
 ====
 
-http://django-dbbackup.readthedocs.org/
+See our offical documentation at `Read The Docs`_.
+
+Contributing
+============
+
+All contribution are very welcomed, propositions, problems, bugs and
+enhancement are tracked with `GitHub issues`_ system and patch are submitted
+via `pull requests`_.
+
+We use `Travis`_ coupled with `Coveralls`_ as continious integration tools.
+
+.. _`Read The Docs`: http://django-dbbackup.readthedocs.org/
+.. _`GitHub issues`: https://github.com/django-dbbackup/django-dbbackup/issues
+.. _`pull requests`: https://github.com/django-dbbackup/django-dbbackup/pulls
+.. _Travis: https://travis-ci.org/django-dbbackup/django-dbbackup
+.. _Coveralls: https://coveralls.io/github/django-dbbackup/django-dbbackup
diff --git a/TODO.md b/TODO.md
diff --git a/dbbackup/__init__.py b/dbbackup/__init__.py
@@ -1 +1,6 @@
-VERSION = "2.0.5a"
+"Management commands to help backup and restore a project database to \
+AmazonS3, Dropbox or local disk."
+VERSION = __version__ = "2.0.5a"
+__author__ = 'Michael Shepanski'
+__email__ = 'mjs7231@gmail.com'
+__url__ = 'https://github.com/django-dbbackup/django-dbbackup'
diff --git a/dbbackup/management/commands/dbbackup.py b/dbbackup/management/commands/dbbackup.py
@@ -37,7 +37,7 @@ def handle(self, **options):
         """ Django command handler. """
         try:
             self.clean = options.get('clean')
-            self.clean_keep = getattr(settings, 'DBBACKUP_CLEANUP_KEEP', 10)
+            self.clean_keep = settings.CLEANUP_KEEP
             self.database = options.get('database')
             self.servername = options.get('servername')
             self.compress = options.get('compress')

diff --git a/dbbackup/management/commands/mediabackup.py b/dbbackup/management/commands/mediabackup.py
@@ -17,6 +17,7 @@
 from dbbackup.storage.base import StorageError
 from dbbackup import settings as dbbackup_settings
 
+
 class Command(BaseCommand):
     help = "backup_media [--encrypt] [--clean] [--no-compress] " \
     "--servername SERVER_NAME"

diff --git a/requirements-tests.txt b/requirements-tests.txt
@@ -2,3 +2,4 @@ pep8
 flake8
 mock
 coverage
+python-gnupg
diff --git a/setup.py b/setup.py
@@ -1,27 +1,25 @@
-import os
 from setuptools import setup, find_packages
-
-from dbbackup import VERSION
-
-
-def get_path(fname):
-    return os.path.join(os.path.dirname(__file__), fname)
+import dbbackup
 
 
 def get_requirements():
     return open('requirements.txt').read().splitlines()
 
 
+def get_test_requirements():
+    return open('requirements-tests.txt').read().splitlines()
+
+
 setup(
     name='django-dbbackup',
-    version=VERSION,
-    description='Management commands to help backup and restore a project database to AmazonS3, Dropbox or local disk.',
-    author='Michael Shepanski',
-    author_email='mjs7231@gmail.com',
+    version=dbbackup.__version__,
+    description=dbbackup.__doc__,
+    author=dbbackup.__author__,
+    author_email=dbbackup.__email__,
     install_requires=get_requirements(),
-    tests_require=('mock', 'python-gnupg'),
+    tests_require=get_test_requirements(),
     license='BSD',
-    url='https://github.com/mjs7231/django-dbbackup',
+    url='https://github.com/django-dbbackup/django-dbbackup',
     keywords=['django', 'dropbox', 'database', 'backup', 'amazon', 's3'],
     packages=find_packages(exclude=['tests.runtests.main']),
     test_suite='tests.runtests.main',