Last fixes and removals

Author: aboudreault

CHANGELOG.rst

@@ -28,6 +28,8 @@ Bug Fixes
 
 Others
 ------
+* The driver has a new dependency: geomet. It comes from the dse-driver unification and
+  is used to support DSE geo types.
 
 Deprecations
 ------------

README.rst

@@ -1,5 +1,5 @@
-DataStax Python Driver for Apache Cassandra and DataStax products
-=================================================================
+DataStax Driver for Apache Cassandra
+====================================
 
 .. image:: https://travis-ci.org/datastax/python-driver.png?branch=master
    :target: https://travis-ci.org/datastax/python-driver

build.yaml

@@ -141,19 +141,6 @@ schedules:
         - python: [3.4, 3.6, 3.7, 3.8]
         - cassandra: ['2.0', '2.1', '2.2', '3.0', 'test-dse']
 
-  # TODO: Temporary, don't merge me
-  python_oss_next_tests:
-    schedule: adhoc
-    disable_pull_requests: true
-    branches:
-      include: [/oss-next.*/]
-    env_vars: |
-      EVENT_LOOP_MANAGER='libev'
-      EXCLUDE_LONG=1
-    matrix:
-      exclude:
-        - python: [3.4, 3.6, 3.7, 3.8]
-
 python:
   - 2.7
   - 3.4
@@ -268,14 +255,6 @@ build:
       echo "==========RUNNING INTEGRATION TESTS=========="
       EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CCM_ARGS="$CCM_ARGS" DSE_VERSION=$DSE_VERSION CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION MAPPED_CASSANDRA_VERSION=$MAPPED_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=standard_results.xml tests/integration/standard/ || true
 
-      # TODO: Temporary, don't merge this 2.1 stuff...
-      # if [ "$CCM_CASSANDRA_VERSION" == "2.1.21" ]; then
-      #   echo "Testing cassandra 2.1 with protocol V2"
-      #   PROTOCOL_VERSION=2 EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CCM_ARGS="$CCM_ARGS" CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION MAPPED_CASSANDRA_VERSION=$MAPPED_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=standard_v2_results.xml tests/integration/standard/ || true
-      #   echo "Testing cassandra 2.1 with protocol V1"
-      #   PROTOCOL_VERSION=1 EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CCM_ARGS="$CCM_ARGS" CASSANDRA_VERSION=$CCM_CASSANDRA_VERSION MAPPED_CASSANDRA_VERSION=$MAPPED_CASSANDRA_VERSION VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=standard_v1_results.xml tests/integration/standard/ || true
-      # fi
-
       if [ -n "$DSE_VERSION" ] && ! [[ $DSE_VERSION == "4.8"* ]]; then
         echo "==========RUNNING DSE INTEGRATION TESTS=========="
         EVENT_LOOP_MANAGER=$EVENT_LOOP_MANAGER CASSANDRA_DIR=$CCM_INSTALL_DIR DSE_VERSION=$DSE_VERSION ADS_HOME=$HOME/ VERIFY_CYTHON=$FORCE_CYTHON nosetests -s -v --logging-format="[%(levelname)s] %(asctime)s %(thread)d: %(message)s" --with-ignore-docstrings --with-xunit --xunit-file=dse_results.xml tests/integration/advanced/ || true

cassandra/cluster.py

@@ -2962,7 +2962,7 @@ def prepare(self, query, custom_payload=None, keyspace=None):
         future = ResponseFuture(self, message, query=None, timeout=self.default_timeout)
         try:
             future.send_request()
-            response = future.result()[0]
+            response = future.result().one()
         except Exception:
             log.exception("Error preparing query:")
             raise

cassandra/policies.py

@@ -1168,8 +1168,8 @@ class DSELoadBalancingPolicy(DefaultLoadBalancingPolicy):
     *Deprecated:* This will be removed in the next major release,
     consider using :class:`.DefaultLoadBalancingPolicy`.
     """
-    def __init__(self, *args):
-        super(DSELoadBalancingPolicy, self).__init__(*args)
+    def __init__(self, *args, **kwargs):
+        super(DSELoadBalancingPolicy, self).__init__(*args, **kwargs)
         warnings.warn("DSELoadBalancingPolicy will be removed in 4.0. Consider using "
                       "DefaultLoadBalancingPolicy.", DeprecationWarning)
 

cassandra/protocol.py

@@ -589,7 +589,7 @@ def _write_query_params(self, f, protocol_version):
             else:
                 raise UnsupportedOperation(
                     "Keyspaces may only be set on queries with protocol version "
-                    "DSE_V2 or higher. Consider setting Cluster.protocol_version to ProtocolVersion.DSE_V2.")
+                    "5 or DSE_V2 or higher. Consider setting Cluster.protocol_version.")
 
         if ProtocolVersion.uses_int_query_flags(protocol_version):
             write_uint(f, flags)

docs/getting_started.rst

@@ -47,7 +47,7 @@ behavior in some other way, this is the place to do it:
     cluster = Cluster(execution_profiles={EXEC_PROFILE_DEFAULT: profile})
     session = cluster.connect()
 
-    print session.execute("SELECT release_version FROM system.local")[0]
+    print(session.execute("SELECT release_version FROM system.local").one())
 
 Profiles are passed in by ``execution_profiles`` dict.
 
@@ -70,7 +70,7 @@ In this case we can construct the base ``ExecutionProfile`` passing all attribut
     cluster = Cluster(execution_profiles={EXEC_PROFILE_DEFAULT: profile})
     session = cluster.connect()
 
-    print session.execute("SELECT release_version FROM system.local")[0]
+    print(session.execute("SELECT release_version FROM system.local").one())
 
 Users are free to setup additional profiles to be used by name:
 

docs/index.rst

@@ -1,7 +1,7 @@
-DataStax Python Driver for Apache Cassandra and DataStax products
-=================================================================
-A Python client driver for `Apache Cassandra <http://cassandra.apache.org>`_ and
-DataStax products. This driver works exclusively with the Cassandra Query Language v3 (CQL3)
+DataStax Python Driver for Apache Cassandra
+===========================================
+A Python client driver for `Apache Cassandra <http://cassandra.apache.org>`_.
+This driver works exclusively with the Cassandra Query Language v3 (CQL3)
 and Cassandra's native protocol.  Cassandra 2.1+ is supported, including DSE 4.7+.
 
 The driver supports Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.

setup.py

@@ -416,7 +416,7 @@ def run_setup(extensions):
     setup(
         name='cassandra-driver',
         version=__version__,
-        description=' DataStax Driver for Apache Cassandra and DataStax products',
+        description=' DataStax Driver for Apache Cassandra',
         long_description=long_description,
         url='http://github.com/datastax/python-driver',
         project_urls={