Merge tag '3.29.0' of https://github.com/datastax/python-driver into …

…sync_with_upstream_3.29.1 version 3.29.0 * tag '3.29.0' of https://github.com/datastax/python-driver: Documentation (and other) updates for 3.29.0 (datastax#1194) PYTHON-1331 ssl.match_hostname() is deprecated in 3.7 (datastax#1191) PYTHON-1371 Add explicit exception type for serialization failures (datastax#1193) Remove outdated Python pre-3.7 references (datastax#1186) PYTHON-1368 Avoid installing DSE deps + executing DSE tests for Python 3.12 (datastax#1188) PYTHON-1366 Handle removal of asyncore in Python 3.12 (datastax#1187) Removed backup(.bak) files (datastax#1185) docs: Fix typo in add_callbacks (datastax#1177) Remove some remnants of Python2 (datastax#1172) PYTHON-1313 Fix asyncio removals in Python 3.10 (datastax#1179) PYTHON-1364 Fix ssl.wrap_socket errors (from eventlet) for Python 3.12 (datastax#1181) Add Jenkins support for Python 3.12.0 (datastax#1180) Update redirects in docs.yaml (datastax#1178) Jenkins using new python versions in the matrix (datastax#1174) Update docs.yaml to point to most recent 3.28.0 docs changes CONN-38 Notes for 3.28.0 on PYTHON-1350 (datastax#1167) Include docs for 3.28.0 Fixed non-valid rst in README
fruch · Jun 6, 2024 · de04ce0 · de04ce0
2 parents 8953796 + 1a947f8
commit de04ce0
Show file tree

Hide file tree

Showing 122 changed files with 824 additions and 2,308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -44,3 +44,6 @@ tests/unit/cython/bytesio_testhelper.c
 #iPython
 *.ipynb
 
+venv
+docs/venv
+.eggs
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,3 +1,19 @@
+3.29.0
+======
+December 19, 2023
+
+Features
+--------
+* Add support for Python 3.9 through 3.12, drop support for 3.7 (PYTHON-1283)
+* Removal of dependency on six module (PR 1172)
+* Raise explicit exception when deserializing a vector with a subtype that isn’t a constant size (PYTHON-1371)
+
+Others
+------
+* Remove outdated Python pre-3.7 references (PR 1186)
+* Remove backup(.bak) files (PR 1185)
+* Fix doc typo in add_callbacks (PR 1177)
+
 3.28.0
 ======
 June 5, 2023

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -26,7 +26,6 @@ To protect the community, all contributors are required to `sign the DataStax Co
 
 Design and Implementation Guidelines
 ------------------------------------
-- We support Python 2.7+, so any changes must work in any of these runtimes (we use ``six``, ``futures``, and some internal backports for compatability)
 - We have integrations (notably Cassandra cqlsh) that require pure Python and minimal external dependencies. We try to avoid new external dependencies. Where compiled extensions are concerned, there should always be a pure Python fallback implementation.
 - This project follows `semantic versioning <http://semver.org/>`_, so breaking API changes will only be introduced in major versions.
 - Legacy ``cqlengine`` has varying degrees of overreaching client-side validation. Going forward, we will avoid client validation where server feedback is adequate and not overly expensive.

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/Jenkinsfile.bak b/Jenkinsfile.bak
diff --git a/README-dev.rst b/README-dev.rst
@@ -114,7 +114,7 @@ Use tee to capture logs and see them on your terminal::
 
 Testing Multiple Python Versions
 --------------------------------
-If you want to test all of python 2.7, 3.5, 3.6, 3.7, and pypy, use tox (this is what
+Use tox to test all of Python 3.8 through 3.12 and pypy (this is what
 TravisCI runs)::
 
     tox

diff --git a/README.rst b/README.rst
@@ -10,7 +10,7 @@ Scylla Enterprise (2018.1.x+) using exclusively Cassandra's binary protocol and
 .. image:: https://github.com/scylladb/python-driver/workflows/CI%20Docs/badge.svg?tag=*-scylla
    :target: https://github.com/scylladb/python-driver/actions?query=workflow%3A%22CI+Docs%22+event%3Apush+branch%3A*-scylla
 
-The driver supports Python versions 3.6-3.12.
+The driver supports Python 3.8 through 3.12.
 
 .. **Note:** This driver does not support big-endian systems.
 
@@ -67,7 +67,7 @@ Contributing
 See `CONTRIBUTING <https://github.com/scylladb/python-driver/blob/master/CONTRIBUTING.rst>`_.
 
 Error Handling
-------------
+--------------
 While originally written for the Java driver, users may reference the `Cassandra error handling done right blog <https://www.datastax.com/blog/cassandra-error-handling-done-right>`_ for resolving error handling scenarios with Apache Cassandra.
 
 Reporting Problems

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,9 +1,6 @@
 environment:
   matrix:
-    - PYTHON: "C:\\Python27-x64"
-      cassandra_version: 3.11.2
-      ci_type: standard
-    - PYTHON: "C:\\Python35-x64"
+    - PYTHON: "C:\\Python37-x64"
       cassandra_version: 3.11.2
       ci_type: standard
 os: Visual Studio 2015

diff --git a/benchmarks/callback_full_pipeline.py b/benchmarks/callback_full_pipeline.py
@@ -18,7 +18,6 @@
 from threading import Event
 
 from base import benchmark, BenchmarkThread
-from six.moves import range
 
 log = logging.getLogger(__name__)
 

diff --git a/benchmarks/future_batches.py b/benchmarks/future_batches.py
@@ -14,7 +14,7 @@
 
 import logging
 from base import benchmark, BenchmarkThread
-from six.moves import queue
+import queue
 
 log = logging.getLogger(__name__)
 

diff --git a/benchmarks/future_full_pipeline.py b/benchmarks/future_full_pipeline.py
@@ -14,7 +14,7 @@
 
 import logging
 from base import benchmark, BenchmarkThread
-from six.moves import queue
+import queue
 
 log = logging.getLogger(__name__)
 

diff --git a/benchmarks/sync.py b/benchmarks/sync.py
@@ -13,7 +13,6 @@
 # limitations under the License.
 
 from base import benchmark, BenchmarkThread
-from six.moves import range
 
 
 class Runner(BenchmarkThread):

diff --git a/build.yaml.bak b/build.yaml.bak