From 9a0170e3139f9d4d223c8873494b556175e266db Mon Sep 17 00:00:00 2001
From: Konsta Vesterinen <konsta.vesterinen@gmail.com>
Date: Tue, 9 Sep 2014 08:57:54 +0300
Subject: [PATCH] Add smart version checking, bump version

---
 CHANGES.rst                  |  7 +++++++
 setup.py                     | 16 +++++++++++++++-
 sqlalchemy_utils/__init__.py |  2 +-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 95be550..9e0f903 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,6 +4,13 @@ Changelog
 Here you can see the full list of changes between each SQLAlchemy-Utils release.
 
 
+0.26.16 (2014-09-09)
+^^^^^^^^^^^^^^^^^^^^
+
+- Fix aggregate value handling for cascade deleted objects
+- Fix ambiguous column sorting with join table inheritance in sort_query
+
+
 0.26.15 (2014-08-28)
 ^^^^^^^^^^^^^^^^^^^^
 
diff --git a/setup.py b/setup.py
index af4e38d..825659e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,9 +5,23 @@ SQLAlchemy-Utils
 Various utility functions and custom data types for SQLAlchemy.
 """
 from setuptools import setup, find_packages
+import os
+import re
 import sys
 
 
+HERE = os.path.dirname(os.path.abspath(__file__))
+PY3 = sys.version_info[0] == 3
+
+
+def get_version():
+    filename = os.path.join(HERE, 'sqlalchemy_utils', '__init__.py')
+    with open(filename) as f:
+        contents = f.read()
+    pattern = r"^__version__ = '(.*?)'$"
+    return re.search(pattern, contents, re.MULTILINE).group(1)
+
+
 PY3 = sys.version_info[0] == 3
 
 
@@ -44,7 +58,7 @@ for name, requirements in extras_require.items():
 
 setup(
     name='SQLAlchemy-Utils',
-    version='0.26.15',
+    version=get_version(),
     url='https://github.com/kvesteri/sqlalchemy-utils',
     license='BSD',
     author='Konsta Vesterinen, Ryan Leckey, Janne Vanhala, Vesa Uimonen',
diff --git a/sqlalchemy_utils/__init__.py b/sqlalchemy_utils/__init__.py
index f0b6ef0..9c4da1f 100644
--- a/sqlalchemy_utils/__init__.py
+++ b/sqlalchemy_utils/__init__.py
@@ -75,7 +75,7 @@ from .types import (
 from .models import Timestamp
 
 
-__version__ = '0.26.15'
+__version__ = '0.26.16'
 
 
 __all__ = (