Merge tag '3.29.1' of https://github.com/datastax/python-driver into sync_with_upstream_3.29.1

version 3.29.1

* tag '3.29.1' of https://github.com/datastax/python-driver:
  Release 3.29.1: changelog & version (datastax#1199)
  PYTHON-1378 Expand search directories for includes (datastax#1198)
  clean up last "import six" (datastax#1197)
  fix build from source on macos using homebrew (datastax#1196)
  Added 3.29.0 to docs.yaml

Author: fruch

CHANGELOG.rst

@@ -1,3 +1,12 @@
+3.29.1
+======
+March 19, 2024
+
+Bug Fixes
+--------
+* cassandra-driver for Python 3.12 Linux is compiled without libev support (PYTHON-1378)
+* Consider moving to native wheel builds for OS X and removing universal2 wheels (PYTHON-1379)
+
 3.29.0
 ======
 December 19, 2023

cassandra/__init__.py

@@ -23,7 +23,7 @@ def emit(self, record):
 
 logging.getLogger('cassandra').addHandler(NullHandler())
 
-__version_info__ = (3, 29, 0)
+__version_info__ = (3, 29, 1)
 __version__ = '.'.join(map(str, __version_info__))
 
 

cassandra/metadata.py

@@ -42,7 +42,6 @@
 from cassandra.util import OrderedDict, Version
 from cassandra.pool import HostDistance
 from cassandra.connection import EndPoint
-from cassandra.compat import Mapping
 from cassandra.tablets import Tablets
 
 log = logging.getLogger(__name__)

docs.yaml

@@ -22,6 +22,8 @@ sections:
       # build extensions like libev
       CASS_DRIVER_NO_CYTHON=1 python setup.py build_ext --inplace --force
 versions:
+  - name: '3.29'
+    ref: 1a947f84
   - name: '3.28'
     ref: 4325afb6
   - name: '3.27'

docs/installation.rst

@@ -26,7 +26,7 @@ To check if the installation was successful, you can run::
 
     python -c 'import cassandra; print cassandra.__version__'
 
-It should print something like "3.29.0".
+It should print something like "3.29.1".
 
 .. _installation-datastax-graph:
 

docs/upgrading.rst

@@ -374,7 +374,3 @@ The following dependencies have officially been made optional:
 
 * ``scales``
 * ``blist``
-
-And one new dependency has been added (to enable Python 3 support):
-
-* ``six``

setup.py

@@ -138,15 +138,22 @@ class BuildFailed(Exception):
     def __init__(self, ext):
         self.ext = ext
 
+is_windows = sys.platform.startswith('win32')
+is_macos = sys.platform.startswith('darwin')
 
 murmur3_ext = Extension('cassandra.cmurmur3',
                         sources=['cassandra/cmurmur3.c'])
 
+libev_includes = ['/usr/include/libev', '/usr/local/include', '/opt/local/include', '/usr/include']
+libev_libdirs = ['/usr/local/lib', '/opt/local/lib', '/usr/lib64']
+if is_macos:
+    libev_includes.extend(['/opt/homebrew/include', os.path.expanduser('~/homebrew/include')])
+    libev_libdirs.extend(['/opt/homebrew/lib'])
 libev_ext = Extension('cassandra.io.libevwrapper',
                       sources=['cassandra/io/libevwrapper.c'],
-                      include_dirs=['/usr/include/libev', '/usr/local/include', '/opt/local/include'],
+                      include_dirs=libev_includes,
                       libraries=['ev'],
-                      library_dirs=['/usr/local/lib', '/opt/local/lib'])
+                      library_dirs=libev_libdirs)
 
 platform_unsupported_msg = \
 """
@@ -169,8 +176,6 @@ def __init__(self, ext):
 =================================================================================
 """
 
-is_windows = os.name == 'nt'
-
 is_pypy = "PyPy" in sys.version
 if is_pypy:
     sys.stderr.write(pypy_unsupported_msg)