Resolving conflicts from cabrera-py33_fixes.

.gitignore

@@ -2,3 +2,4 @@
 /dist
 /python_memcached.egg-info
 .tox
+.coverage

.travis.yml

@@ -6,6 +6,7 @@ python:
   - 3.3
   - 3.4
   - pypy
+  - 3.3
 install: python setup.py install
 before_script: pip install nose
 script: nosetests

requirements.txt

@@ -0,0 +1 @@
+six

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"
         ])
-

test-requirements.txt

@@ -0,0 +1,3 @@
+nose
+coverage
+hacking

tox.ini

@@ -7,19 +7,17 @@ skipsdist = True
 usedevelop = True
 # Customize pip command, add -U to force updates.
 install_command = pip install -U {opts} {packages}
-deps = nose
+deps = -r{toxinidir}/requirements.txt
+       -r{toxinidir}/test-requirements.txt
 commands = nosetests {posargs}
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-deps = hacking
 commands = flake8
 
 [testenv:cover]
-deps = nose
-       coverage
 commands = nosetests --with-coverage {posargs}
 
 [flake8]