Merge branch 'release/1.3' into develop

.hgtags

@@ -1,24 +0,0 @@
-bd537cd8beba30f1a26328e02126d3d1b14ebf8f 0.2.5
-1b426859f05b8a003411964883ed5d42ec6c1b01 0.3.0
-97da228cc698bfae05f60a68ec978030722b0777 0.3.1
-50c69325d3758d2e82541b13be2794ebbe9ee449 0.4.0
-d35a41ea96d3604a3c2654590c5c76b8865c4251 0.4.1
-a4bd56a7c2ea4c6f16a726e47bb185101934fe08 0.4.2
-447247c1ce1fbc77ac79c5855630af306f4f8c42 0.4.3
-5b2e4f7fc267daf71325991e913f98e6f96259bb 0.4.4
-ea4d636f3459ddbb51d87e921cf23f87e41d658d 0.4.5
-9a30f34bc5b07376ed6752eed94d9d58e791fbac 0.4.6
-9dc2a0e48494d6a354f5ca25db31638cede4bae4 0.4.7
-a3be97628ed8633e2fe232e6680474e7fd3e9fea 0.5.0
-bf3db2fe192d4a02bf531e61e23df342c36d6b1b 0.5.1
-67a86cf9f7c8ac8d9da855c13abbef2547033cce 0.5.2
-6967bbbee378f470e4b1df02b57112dd050d424b 0.5.3
-5965315c03c1a8c1cfb34752cca3802d68156e27 0.5.4
-4109e0db4340042cb85ea8a7d2b6ce37245738c6 0.5.5
-ade167225d06cb6888ea8bfa84e7d020590171c6 0.5.6
-dff01be9c8af328f8fcbc2fc97edcbe8d97840e2 0.5.7
-f8f7eaf275c5e8ac52174642265af55691abef7c 0.5.8
-4b36382cdfd756f45f81b0d042aaf331c3eabe30 0.6.0
-0ac352fec2c2a03ac801ff0c40f0649ef16e1f64 0.6.1
-34a0511928629872ce8cc5f94c6bed65f82ac343 0.7.0
-74c22fa8c4a64ea37f9b6b2515a4162b8b8b1a2a 0.7.1

dbtemplates/__init__.py

@@ -1,2 +1,2 @@
 # following PEP 386
-__version__ = "1.3a1"
+__version__ = "1.3"

docs/conf.py

@@ -16,7 +16,7 @@ import sys, os
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#sys.path.append(os.path.abspath('.'))
+sys.path.append(os.path.abspath('.'))
 
 # -- General configuration -----------------------------------------------------
 
@@ -45,9 +45,14 @@ copyright = u'2007-2012, Jannis Leidel and contributors'
 # built documents.
 #
 # The short X.Y version.
-version = '1.2'
-# The full version, including alpha/beta/rc tags.
-release = '1.2.1'
+try:
+    from dbtemplates import __version__
+    # The short X.Y version.
+    version = '.'.join(__version__.split('.')[:2])
+    # The full version, including alpha/beta/rc tags.
+    release = __version__
+except ImportError:
+    version = release = 'dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.