From 297c39cfbd126f178a966047abbc17da079f954f Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Thu, 7 Aug 2014 11:33:58 -0500 Subject: [PATCH] Update ez_setup debian patch --- debian/patches/0001-don-t-use-ez_setup.patch | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/debian/patches/0001-don-t-use-ez_setup.patch b/debian/patches/0001-don-t-use-ez_setup.patch index 7e73a67a..32996d60 100644 --- a/debian/patches/0001-don-t-use-ez_setup.patch +++ b/debian/patches/0001-don-t-use-ez_setup.patch @@ -11,24 +11,21 @@ It's ok though, we can rely on the Depends and Build-Depends for making sure python-setuptools and the various other deps are around at the right times. --- - setup.py | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - diff --git a/setup.py b/setup.py -index 0c28d3d..c0fd6c1 100644 +index 11cfd4c..4f05d1f 100644 --- a/setup.py +++ b/setup.py -@@ -15,9 +15,6 @@ - from __future__ import print_function - import sys +@@ -20,9 +20,6 @@ if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests": + from gevent.monkey import patch_all + patch_all() -import ez_setup -ez_setup.use_setuptools() - - if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests": - from gevent.monkey import patch_all - patch_all() -@@ -192,8 +189,8 @@ + from setuptools import setup + from distutils.command.build_ext import build_ext + from distutils.core import Extension +@@ -194,8 +191,8 @@ def run_setup(extensions): author_email='tyler@datastax.com', packages=['cassandra', 'cassandra.io'], include_package_data=True,