From 9ee72896faa16a0a5d4151d3634295ffccfb6e52 Mon Sep 17 00:00:00 2001 From: Oliver Bock Date: Thu, 19 Jun 2014 15:03:18 +0200 Subject: [PATCH] Updated Debian-specific patch (failed to apply) * Kept original patch author's in-line comment for reference * Updated debian/changelog accordingly, just to make sure * Added patch validation step to release protocol in README-dev --- README-dev.rst | 1 + debian/changelog | 6 ++++++ debian/patches/0001-don-t-use-ez_setup.patch | 7 ++++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README-dev.rst b/README-dev.rst index 8c6a13bb..5242e5d3 100644 --- a/README-dev.rst +++ b/README-dev.rst @@ -3,6 +3,7 @@ Releasing * Run the tests and ensure they all pass * If dependencies have changed, make sure ``debian/control`` is up to date +* Make sure all patches in ``debian/patches`` still apply cleanly * Update CHANGELOG.rst * Update the version in ``cassandra/__init__.py`` * Commit the changelog and version changes diff --git a/debian/changelog b/debian/changelog index 0360d906..1568c12f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-cassandra-driver (2.0.2-2) unstable; urgency=low + + * Fixed debian/patches + + -- Carsten Aulbert Thu, 19 Jun 2014 14:07:27 +0200 + python-cassandra-driver (2.0.2-1) unstable; urgency=low * Release 2.0.2 diff --git a/debian/patches/0001-don-t-use-ez_setup.patch b/debian/patches/0001-don-t-use-ez_setup.patch index ece0bef8..7e73a67a 100644 --- a/debian/patches/0001-don-t-use-ez_setup.patch +++ b/debian/patches/0001-don-t-use-ez_setup.patch @@ -18,7 +18,8 @@ diff --git a/setup.py b/setup.py index 0c28d3d..c0fd6c1 100644 --- a/setup.py +++ b/setup.py -@@ -1,8 +1,5 @@ +@@ -15,9 +15,6 @@ + from __future__ import print_function import sys -import ez_setup @@ -27,12 +28,12 @@ index 0c28d3d..c0fd6c1 100644 if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests": from gevent.monkey import patch_all patch_all() -@@ -174,8 +171,8 @@ def run_setup(extensions): +@@ -192,8 +189,8 @@ author_email='tyler@datastax.com', packages=['cassandra', 'cassandra.io'], include_package_data=True, - install_requires=dependencies, -- tests_require=['nose', 'mock', 'ccm', 'unittest2', 'PyYAML', 'pytz'], +- tests_require=['nose', 'mock', 'PyYAML', 'pytz'], + install_requires=(), + tests_require=(), classifiers=[