From 45403325e0249ff0f61d6ae449a7daeeb7e852e5 Mon Sep 17 00:00:00 2001
From: Sean Reifschneider <jafo@tummy.com>
Date: Sat, 7 Jun 2014 15:27:05 -0600
Subject: Resolving conflicts from cabrera-py33_fixes.

---
 setup.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'setup.py')

diff --git a/setup.py b/setup.py
index 3f305a8..c5693b5 100644
--- a/setup.py
+++ b/setup.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python
 
-from setuptools import setup
-import memcache
+from setuptools import setup  # noqa
+
 
 setup(name="python-memcached",
-      version=memcache.__version__,
+      version="1.53",
       description="Pure python memcached client",
       long_description=open("README.md").read(),
       author="Evan Martin",
@@ -14,6 +14,7 @@ setup(name="python-memcached",
       url="http://www.tummy.com/Community/software/python-memcached/",
       download_url="ftp://ftp.tummy.com/pub/python-memcached/",
       py_modules=["memcache"],
+      install_requires=open('requirements.txt').read().split(),
       classifiers=[
         "Development Status :: 5 - Production/Stable",
         "Intended Audience :: Developers",
@@ -31,4 +32,3 @@ setup(name="python-memcached",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4"
         ])
-
-- 
cgit v1.2.1