Expose version in elasticutils.__version__

This also renames elasticutils.VERSION to elasticutils.PYES_VERSION to avoid convusion.
mozilla · Aug 24, 2012 · 92f35dc · 92f35dc
1 parent 51a2248
commit 92f35dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -16,6 +16,8 @@ None.
   you to do a negative query which reduces scores for documents that
   match.
 
+* The elasticutils version is in ``elasticutils.__version__`` now.
+
 
 Version 0.4: Released July 31st, 2012
 =====================================

diff --git a/elasticutils/__init__.py b/elasticutils/__init__.py
@@ -2,7 +2,10 @@
 from itertools import izip
 from operator import itemgetter
 
-from pyes import ES, VERSION
+from pyes import ES
+from pyes import VERSION as PYES_VERSION
+
+from elasticutils._version import __version__
 
 
 log = logging.getLogger('elasticutils')
@@ -67,7 +70,7 @@ def get_es(hosts=None, default_indexes=None, timeout=None, dump_curl=None,
     # is set it manually after the ES has been created and
     # defaults['dump_curl'] is truthy. This might not work for all
     # values of dump_curl.
-    if VERSION[0:2] == (0, 15) and dump_curl is not None:
+    if PYES_VERSION[0:2] == (0, 15) and dump_curl is not None:
         es.dump_curl = dump_curl
 
     return es