summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-05-20 13:26:21 -0400
committerLance Stout <lancestout@gmail.com>2011-05-20 13:26:21 -0400
commite2de82ac8d45d2a6709154ef27dbeb3d08ce1a76 (patch)
treef1eba0699b6a3a2752cb04a6299ab5e8e5006574 /setup.py
parentf125c11a810cf308473394262879f94166c3f564 (diff)
parent9f1648328f17b608651989606b9cf2636cdcfbec (diff)
downloadslixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.gz
slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.bz2
slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.xz
slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.zip
Merge branch 'develop' into stream_features
Conflicts: sleekxmpp/clientxmpp.py
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 1443e90f..19047925 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,8 @@
from distutils.core import setup
import sys
+import sleekxmpp
+
# if 'cygwin' in sys.platform.lower():
# min_version = '0.6c6'
# else:
@@ -25,7 +27,7 @@ import sys
#
# from setuptools import setup, find_packages, Extension, Feature
-VERSION = '1.0.0.0'
+VERSION = sleekxmpp.__version__
DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
LONG_DESCRIPTION = """
SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).