Remove hardcoded version numbers

diff --git a/docs/conf.py b/docs/conf.py
index adbcdc0d0ee7f611bf032a4f8e9d1e1d905eeb29..ee9ff78cdfe2a5f6520af46dc701cf7b7622d6d2 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,12 @@ copyright = u'2011, Joshua Roesslein'
 # built documents.
 #
 # The short X.Y version.
-version = '1.7'
+sys.path.insert(0, '..')
+from tweepy import __version__
+
+version = __version__
 # The full version, including alpha/beta/rc tags.
-release = '1.7'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
index edd4e3e49a72d868b3c6c04ab5bb01eb8e90c559..0f99cb5d542940e96190fee6699637ca15835edd 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,9 +1,10 @@
 #!/usr/bin/env python
 #from distutils.core import setup
 from setuptools import setup, find_packages
+from tweepy import __version__
 
 setup(name="tweepy",
-      version="1.9",
+      version=__version__,
       description="Twitter library for python",
       license="MIT",
       author="Joshua Roesslein",