Merge pull request #259 from AndreaCrotti/version

Version

MANIFEST.in

@@ -2,4 +2,3 @@ include *.rst
 global-include *.py
 recursive-include pelican *.html *.css *png
 include LICENSE
-global-include *.bat

docs/conf.py

@@ -3,6 +3,8 @@ import sys, os
 
 sys.path.append(os.path.abspath('..'))
 
+from pelican import __version__, __major__
+
 # -- General configuration -----------------------------------------------------
 templates_path = ['_templates']
 extensions = ['sphinx.ext.autodoc',]
@@ -11,8 +13,8 @@ master_doc = 'index'
 project = u'Pelican'
 copyright = u'2010, Alexis Metaireau and contributors'
 exclude_patterns = ['_build']
-version = "2"
+version = __version__
-release = version
+release = __major__
 
 # -- Options for HTML output ---------------------------------------------------
 

pelican/__init__.py

@@ -11,7 +11,9 @@ from pelican.utils import clean_output_dir, files_changed
 from pelican.writers import Writer
 from pelican import log
 
-__version__ = "3.0"
+__major__ = 3
+__minor__ = 0
+__version__ = "{0}.{1}".format(__major__, __minor__)
 
 
 class Pelican(object):

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 from setuptools import setup
 
-VERSION = "3.0" # find a better way to do so.
+from pelican import __version__
 
 requires = ['feedgenerator', 'jinja2', 'pygments', 'docutils', 'pytz']
 
@@ -21,7 +21,7 @@ entry_points = {
 
 setup(
     name = "pelican",
-    version = VERSION,
+    version = __version__,
     url = 'http://pelican.notmyidea.org/',
     author = 'Alexis Metaireau',
     author_email = 'alexis@notmyidea.org',