Merge branch 'oss-next' into ngdg_master_ft

Author: aboudreault

CHANGELOG.rst

@@ -38,6 +38,7 @@ Features
 * Flexible version parsing (PYTHON-1174)
 * Support NULL in collection deserializer (PYTHON-1123)
 * Avoid warnings about unspecified load balancing policy when connecting to a cloud cluster (PYTHON-1177)
+* Add Python 3.8 support (PYTHON-1189)
 * [GRAPH] Ability to execute Fluent Graph queries asynchronously (PYTHON-1129)
 
 Bug Fixes

README-dev.rst

@@ -234,3 +234,18 @@ An EAP release is only uploaded on a private server and it is not published on p
     python setup.py doc
 
 * Upload the docs on the EAP download server.
+
+Adding a New Python Runtime Support
+===================================
+
+* Add the new python version to our jenkins image:
+  https://github.com/riptano/openstack-jenkins-drivers/
+
+* Add the new python version in job-creator:
+  https://github.com/riptano/job-creator/
+
+* Run the tests and ensure they all pass
+  * also test all event loops
+
+* Update the wheels building repo to support that version:
+  https://github.com/riptano/python-dse-driver-wheels

README.rst

@@ -7,7 +7,7 @@ DataStax Python Driver for Apache Cassandra and DataStax products
 A modern, `feature-rich <https://github.com/datastax/python-driver#features>`_ and highly-tunable Python client library for Apache Cassandra (2.1+) and
 DataStax Enterprise (4.7+) using exclusively Cassandra's binary protocol and Cassandra Query Language v3.
 
-The driver supports Python 2.7, 3.4, 3.5, 3.6 and 3.7.
+The driver supports Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.
 
 **Note:** DataStax products do not support big-endian systems.
 

build.yaml

@@ -8,7 +8,7 @@ schedules:
       EVENT_LOOP_MANAGER='libev'
     matrix:
       exclude:
-        - python: [3.4, 3.6, 3.7]
+        - python: [3.4, 3.6, 3.7, 3.8]
         - cassandra: ['2.1', '3.0', 'test-dse']
 
   commit_long_test:
@@ -20,7 +20,7 @@ schedules:
       EVENT_LOOP_MANAGER='libev'
     matrix:
       exclude:
-        - python: [3.4, 3.6, 3.7]
+        - python: [3.4, 3.6, 3.7, 3.8]
         - cassandra: ['2.1', '3.0', 'test-dse']
 
   commit_branches:
@@ -33,7 +33,7 @@ schedules:
       EXCLUDE_LONG=1
     matrix:
       exclude:
-        - python: [3.4, 3.6, 3.7]
+        - python: [3.4, 3.6, 3.7, 3.8]
         - cassandra: ['2.1', '3.0', 'test-dse']
 
   commit_branches_dev:
@@ -46,7 +46,7 @@ schedules:
       EXCLUDE_LONG=1
     matrix:
       exclude:
-        - python: [2.7, 3.4, 3.7]
+        - python: [2.7, 3.4, 3.7, 3.8]
         - cassandra: ['2.0', '2.1', '2.2', '3.0', 'test-dse', dse-4.8', 'dse-5.0']
 
   release_test:
@@ -150,7 +150,7 @@ schedules:
       JUST_UPGRADE=True
     matrix:
       exclude:
-        - python: [3.4, 3.6, 3.7]
+        - 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
@@ -164,14 +164,15 @@ schedules:
       EXCLUDE_LONG=1
     matrix:
       exclude:
-        - python: [3.4, 3.6, 3.7]
+        - python: [3.4, 3.6, 3.7, 3.8]
 
 python:
   - 2.7
   - 3.4
   - 3.5
   - 3.6
   - 3.7
+  - 3.8
 
 os:
   - ubuntu/bionic64/python-driver

cassandra/cluster.py

@@ -1356,7 +1356,7 @@ def _create_thread_pool_executor(self, **kwargs):
         Create a ThreadPoolExecutor for the cluster. In most cases, the built-in
         `concurrent.futures.ThreadPoolExecutor` is used.
 
-        Python 3.7 and Eventlet cause the `concurrent.futures.ThreadPoolExecutor`
+        Python 3.7+ and Eventlet cause the `concurrent.futures.ThreadPoolExecutor`
         to hang indefinitely. In that case, the user needs to have the `futurist`
         package so we can use the `futurist.GreenThreadPoolExecutor` class instead.
 
@@ -1379,7 +1379,7 @@ def _create_thread_pool_executor(self, **kwargs):
                 except ImportError:
                     # futurist is not available
                     raise ImportError(
-                        ("Python 3.7 and Eventlet cause the `concurrent.futures.ThreadPoolExecutor` "
+                        ("Python 3.7+ and Eventlet cause the `concurrent.futures.ThreadPoolExecutor` "
                          "to hang indefinitely. If you want to use the Eventlet reactor, you "
                          "need to install the `futurist` package to allow the driver to use "
                          "the GreenThreadPoolExecutor. See https://github.com/eventlet/eventlet/issues/508 "

docs/index.rst

@@ -4,7 +4,7 @@ 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)
 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 and 3.7.
+The driver supports Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8.
 
 This driver is open source under the
 `Apache v2 License <http://www.apache.org/licenses/LICENSE-2.0.html>`_.

docs/installation.rst

@@ -3,7 +3,7 @@ Installation
 
 Supported Platforms
 -------------------
-Python 2.7, 3.4, 3.5, 3.6 and 3.7 are supported.  Both CPython (the standard Python
+Python 2.7, 3.4, 3.5, 3.6, 3.7 and 3.8 are supported. Both CPython (the standard Python
 implementation) and `PyPy <http://pypy.org>`_ are supported and tested.
 
 Linux, OSX, and Windows are supported.

setup.py

@@ -447,6 +447,7 @@ def run_setup(extensions):
             'Programming Language :: Python :: 3.5',
             'Programming Language :: Python :: 3.6',
             'Programming Language :: Python :: 3.7',
+            'Programming Language :: Python :: 3.8',
             'Programming Language :: Python :: Implementation :: CPython',
             'Programming Language :: Python :: Implementation :: PyPy',
             'Topic :: Software Development :: Libraries :: Python Modules'

tests/integration/cloud/test_cloud.py

@@ -69,8 +69,8 @@ def test_match_system_local(self):
     def test_set_auth_provider(self):
         self.connect(self.creds)
         self.assertIsInstance(self.cluster.auth_provider, PlainTextAuthProvider)
-        self.assertEqual(self.cluster.auth_provider.username, 'cassandra')
-        self.assertEqual(self.cluster.auth_provider.password, 'cassandra')
+        self.assertEqual(self.cluster.auth_provider.username, 'user1')
+        self.assertEqual(self.cluster.auth_provider.password, 'user1')
 
     def test_support_leaving_the_auth_unset(self):
         with self.assertRaises(NoHostAvailable):

tests/unit/advanced/test_insights.py

@@ -230,9 +230,9 @@ def test_token_aware_policy(self):
 
     def test_whitelist_round_robin_policy(self):
         self.assertEqual(
-            insights_registry.serialize(WhiteListRoundRobinPolicy(['123.123'])),
+            insights_registry.serialize(WhiteListRoundRobinPolicy(['127.0.0.3'])),
             {'namespace': 'cassandra.policies',
-             'options': {'allowed_hosts': ('123.123',)},
+             'options': {'allowed_hosts': ('127.0.0.3',)},
              'type': 'WhiteListRoundRobinPolicy'}
         )