Permalink
Browse files

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

  • Loading branch information...
1 parent 123d9a0 commit 02ef1832f14786b550450a9e6bf46bc7c6382d20 @migurski migurski committed May 29, 2012
Showing with 6 additions and 6 deletions.
  1. +1 −1 Makefile
  2. +0 −1 VERSION.txt
  3. +3 −2 cascadenik/__init__.py
  4. +2 −2 setup.py
View
@@ -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)
View
@@ -1 +0,0 @@
-2.3.0
View
@@ -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']
View
@@ -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,

0 comments on commit 02ef183

Please sign in to comment.