Moved the One True Copy of the version number to cascadenik.__version__

mapnik · May 29, 2012 · 02ef183 · 02ef183
1 parent 123d9a0
commit 02ef183
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION:=$(shell cat VERSION.txt)
+VERSION:=$(shell python -c 'from cascadenik import __version__ as v; print v')
 TARBALL=cascadenik-$(VERSION).tar.gz
 
 all: dist/$(TARBALL)

diff --git a/VERSION.txt b/VERSION.txt
diff --git a/cascadenik/__init__.py b/cascadenik/__init__.py
@@ -5,6 +5,8 @@
 http://code.google.com/p/mapnik-utils/wiki/Cascadenik
 
 """
+__version__ = '2.3.0'
+
 from os import mkdir, chmod
 from os.path import isdir, realpath, expanduser, dirname, exists
 from urlparse import urlparse
@@ -30,8 +32,7 @@
 # compile function -> "compile"
 from .compile import compile, Directories
 
-# define Cascadenik version
-VERSION = '1.0.0'
+# define Cascadenik default cache directory
 CACHE_DIR = '~/.cascadenik'
 
 __all__ = ['load_map', 'compile', '_compile', 'style', 'stylesheet_declarations']

diff --git a/setup.py b/setup.py
@@ -10,8 +10,8 @@
 except ImportError:
     from distutils.core import setup
     HAS_SETUPTOOLS = False
-    
-VERSION = open('VERSION.txt', 'r').read().strip()
+
+from cascadenik import __version__ as VERSION
 
 options = dict(name='cascadenik',
         version = VERSION,