Use versiontools in setup, bump version to 2.0

diff --git a/linaro_django_pagination/__init__.py b/linaro_django_pagination/__init__.py
index e69de29..b8f386c 100644 (file)
--- a/linaro_django_pagination/__init__.py
+++ b/linaro_django_pagination/__init__.py
@@ -0,0 +1,37 @@
+# Copyright (c) 2008, Eric Florenzano
+# Copyright (c) 2010, 2011 Linaro Limited
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+#       notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+#       copyright notice, this list of conditions and the following
+#       disclaimer in the documentation and/or other materials provided
+#       with the distribution.
+#     * Neither the name of the author nor the names of other
+#       contributors may be used to endorse or promote products derived
+#       from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""
+linaro-django-pagination is a set of utilities for creating robust pagination
+tools throughout a django application.
+"""
+
+
+__version__ = (2, 0, 0, "dev", 0)

diff --git a/setup.py b/setup.py
index f1ce26d..e39b77c 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -32,12 +32,20 @@
 from setuptools import setup, find_packages
 
 
 from setuptools import setup, find_packages
 
 

-version = "1.1"
+try:
+    import versiontools
+except ImportError:
+    print "This package requires python-versiontools to be configured"
+    print "See: http://packages.python.org/versiontools/installation.html"
+    raise
+
+
+import linaro_django_pagination

 
 
 setup(
     name='linaro-django-pagination',
 
 
 setup(
     name='linaro-django-pagination',

-    version=version,
+    version=versiontools.format_version(linaro_django_pagination.__version__),

     author='Zygmunt Krynicki',
     author_email='zygmunt.krynicki@linaro.org',
     description="linaro-django-pagination",
     author='Zygmunt Krynicki',
     author_email='zygmunt.krynicki@linaro.org',
     description="linaro-django-pagination",


@@ -63,5 +71,8 @@ setup(
     tests_require=[
         'django-testproject >= 0.1',
     ],
     tests_require=[
         'django-testproject >= 0.1',
     ],

+    setup_requires=[
+        'versiontools >= 1.2'
+    ],

     include_package_data=True,
 )
     include_package_data=True,
 )