From 86b804306d21c0773ef5dc2f663280b308073fa7 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Wed, 13 Apr 2016 13:40:37 -0500 Subject: [PATCH 1/3] Explicit type for scale in cython deserializer Fixes broken compilation that showed up in in Cython 0.24 PYTHON-542 --- cassandra/deserializers.pyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cassandra/deserializers.pyx b/cassandra/deserializers.pyx index 3967ea14..9ffcdd5d 100644 --- a/cassandra/deserializers.pyx +++ b/cassandra/deserializers.pyx @@ -59,7 +59,7 @@ cdef class DesDecimalType(Deserializer): cdef Buffer varint_buf slice_buffer(buf, &varint_buf, 4, buf.size - 4) - scale = unpack_num[int32_t](buf) + cdef int32_t scale = unpack_num[int32_t](buf) unscaled = varint_unpack(&varint_buf) return Decimal('%de%d' % (unscaled, -scale)) From 298785b3472466b83a9faff4c149609f197492d4 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Wed, 13 Apr 2016 14:33:09 -0500 Subject: [PATCH 2/3] 3.2.1 patch version and changelog --- CHANGELOG.rst | 6 ++++++ cassandra/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 694fc124..e0ba17fd 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,9 @@ +3.2.1 +===== +April 13, 2016 + +* Introduced an update to allow deserializer compilation with recently released Cython 0.24 + 3.2.0 ===== April 12, 2016 diff --git a/cassandra/__init__.py b/cassandra/__init__.py index 23cc1f11..ac4b6fb5 100644 --- a/cassandra/__init__.py +++ b/cassandra/__init__.py @@ -22,7 +22,7 @@ class NullHandler(logging.Handler): logging.getLogger('cassandra').addHandler(NullHandler()) -__version_info__ = (3, 2, 0, 'post0') +__version_info__ = (3, 2, 1) __version__ = '.'.join(map(str, __version_info__)) From b7d329218ef1a5d1b0fcfcee307b437054288b17 Mon Sep 17 00:00:00 2001 From: Adam Holmberg Date: Wed, 13 Apr 2016 14:36:27 -0500 Subject: [PATCH 3/3] post-release version --- cassandra/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cassandra/__init__.py b/cassandra/__init__.py index ac4b6fb5..28c20c5d 100644 --- a/cassandra/__init__.py +++ b/cassandra/__init__.py @@ -22,7 +22,7 @@ class NullHandler(logging.Handler): logging.getLogger('cassandra').addHandler(NullHandler()) -__version_info__ = (3, 2, 1) +__version_info__ = (3, 2, 1, 'post0') __version__ = '.'.join(map(str, __version_info__))