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
This commit is contained in:
Oliver Bock
2014-06-19 15:03:18 +02:00
parent 2d425af069
commit 9ee72896fa
3 changed files with 11 additions and 3 deletions

View File

@@ -3,6 +3,7 @@ Releasing
* Run the tests and ensure they all pass * Run the tests and ensure they all pass
* If dependencies have changed, make sure ``debian/control`` * If dependencies have changed, make sure ``debian/control``
is up to date is up to date
* Make sure all patches in ``debian/patches`` still apply cleanly
* Update CHANGELOG.rst * Update CHANGELOG.rst
* Update the version in ``cassandra/__init__.py`` * Update the version in ``cassandra/__init__.py``
* Commit the changelog and version changes * Commit the changelog and version changes

6
debian/changelog vendored
View File

@@ -1,3 +1,9 @@
python-cassandra-driver (2.0.2-2) unstable; urgency=low
* Fixed debian/patches
-- Carsten Aulbert <carsten.aulbert@aei.mpg.de> Thu, 19 Jun 2014 14:07:27 +0200
python-cassandra-driver (2.0.2-1) unstable; urgency=low python-cassandra-driver (2.0.2-1) unstable; urgency=low
* Release 2.0.2 * Release 2.0.2

View File

@@ -18,7 +18,8 @@ diff --git a/setup.py b/setup.py
index 0c28d3d..c0fd6c1 100644 index 0c28d3d..c0fd6c1 100644
--- a/setup.py --- a/setup.py
+++ b/setup.py +++ b/setup.py
@@ -1,8 +1,5 @@ @@ -15,9 +15,6 @@
from __future__ import print_function
import sys import sys
-import ez_setup -import ez_setup
@@ -27,12 +28,12 @@ index 0c28d3d..c0fd6c1 100644
if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests": if __name__ == '__main__' and sys.argv[1] == "gevent_nosetests":
from gevent.monkey import patch_all from gevent.monkey import patch_all
patch_all() patch_all()
@@ -174,8 +171,8 @@ def run_setup(extensions): @@ -192,8 +189,8 @@
author_email='tyler@datastax.com', author_email='tyler@datastax.com',
packages=['cassandra', 'cassandra.io'], packages=['cassandra', 'cassandra.io'],
include_package_data=True, include_package_data=True,
- install_requires=dependencies, - install_requires=dependencies,
- tests_require=['nose', 'mock', 'ccm', 'unittest2', 'PyYAML', 'pytz'], - tests_require=['nose', 'mock', 'PyYAML', 'pytz'],
+ install_requires=(), + install_requires=(),
+ tests_require=(), + tests_require=(),
classifiers=[ classifiers=[