updating setuptools to look for redis-py-VERSION.tar.gz

3 files changed, 8 insertions, 13 deletions

diff --git a/CHANGES b/CHANGES
index ea91ee0..b2087a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+* 2.2.1
+    * Changed archive name to redis-py-VERSION.tar.gz to not conflict
+      with the Redis server archive.
 * 2.2.0
     * Implemented SLAVEOF
     * Implemented CONFIG as config_get and config_set
diff --git a/redis/__init__.py b/redis/__init__.py
index 7c3aa0d..aed97e8 100644
--- a/redis/__init__.py
+++ b/redis/__init__.py
@@ -3,7 +3,7 @@ from redis.client import Redis, ConnectionPool
 from redis.exceptions import RedisError, ConnectionError, AuthenticationError
 from redis.exceptions import ResponseError, InvalidResponse, InvalidData
 
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 
 __all__ = [
     'Redis', 'ConnectionPool',
diff --git a/setup.py b/setup.py
index bb5ec0e..644e98b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,13 @@
 #!/usr/bin/env python
-
-"""
-@file setup.py
-@author Andy McCurdy
-@date 2/12/2010
-@brief Setuptools configuration for redis client
-"""
-
-version = '2.2.0'
+from redis import __version__
 
 sdict = {
     'name' : 'redis',
-    'version' : version,
+    'version' : __version__,
     'description' : 'Python client for Redis key-value store',
     'long_description' : 'Python client for Redis key-value store',
     'url': 'http://github.com/andymccurdy/redis-py',
-    'download_url' : 'http://cloud.github.com/downloads/andymccurdy/redis-py/redis-%s.tar.gz' % version,
+    'download_url' : 'http://cloud.github.com/downloads/andymccurdy/redis-py/redis-py-%s.tar.gz' % __version__,
     'author' : 'Andy McCurdy',
     'author_email' : 'sedrik@gmail.com',
     'maintainer' : 'Andy McCurdy',
@@ -25,7 +17,7 @@ sdict = {
     'packages' : ['redis'],
     'test_suite' : 'tests.all_tests',
     'classifiers' : [
-        'Development Status :: 4 - Beta',
+        'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: MIT License',