Add get_columns to main import, bump version

setup.py

@@ -44,7 +44,7 @@ for name, requirements in extras_require.items():
 
 setup(
     name='SQLAlchemy-Utils',
-    version='0.25.2',
+    version='0.25.3',
     url='https://github.com/kvesteri/sqlalchemy-utils',
     license='BSD',
     author='Konsta Vesterinen, Ryan Leckey, Janne Vanhala, Vesa Uimonen',

sqlalchemy_utils/__init__.py

@@ -5,6 +5,7 @@ from .exceptions import ImproperlyConfigured
 from .functions import (
     defer_except,
     escape_like,
+    get_columns,
     identity,
     primary_keys,
     naturally_equivalent,
@@ -57,7 +58,7 @@ from .types import (
 )
 
 
-__version__ = '0.25.2'
+__version__ = '0.25.3'
 
 
 __all__ = (
@@ -74,6 +75,7 @@ __all__ = (
     force_instant_defaults,
     generates,
     generic_relationship,
+    get_columns,
     identity,
     instrumented_list,
     merge,

tests/functions/test_get_columns.py

@@ -1,5 +1,5 @@
 import sqlalchemy as sa
-from sqlalchemy_utils.functions import get_columns
+from sqlalchemy_utils import get_columns
 from tests import TestCase