Merge pull request apache#776 from datastax/python-754

aboudreault · web-flow · commit d6b211b572cf · 2017-05-30T10:49:59.000-04:00
Bump cython version to allow 0.25.x
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,10 @@ Bug Fixes
 ---------
 * is_idempotent flag is not propagated from PreparedStatement to BoundStatement (PYTHON-736)
 
+Other
+-----
+* Bump Cython dependency version to 0.25.2 (PYTHON-754)
+
 3.10.0
 ======
 May 24, 2017
diff --git a/setup.py b/setup.py
@@ -388,7 +388,7 @@ def run_setup(extensions):
 # 1.) build_ext eats errors at compile time, letting the install complete while producing useful feedback
 # 2.) there could be a case where the python environment has cython installed but the system doesn't have build tools
 if pre_build_check():
- cython_dep = 'Cython>=0.20,<0.25'
+ cython_dep = 'Cython>=0.20,!=0.25,<0.26'
 user_specified_cython_version = os.environ.get('CASS_DRIVER_ALLOWED_CYTHON_VERSION')
 if user_specified_cython_version is not None:
 cython_dep = 'Cython==%s' % (user_specified_cython_version,)

-Original file line number
+Diff line change
 # 1.) build_ext eats errors at compile time, letting the install complete while producing useful feedback
 # 2.) there could be a case where the python environment has cython installed but the system doesn't have build tools
 ifpre_build_check():
 -cython_dep='Cython>=0.20,<0.25'
 +cython_dep='Cython>=0.20,!=0.25,<0.26'
 user_specified_cython_version=os.environ.get('CASS_DRIVER_ALLOWED_CYTHON_VERSION')
 ifuser_specified_cython_versionisnotNone:
 cython_dep='Cython==%s'% (user_specified_cython_version,)