From 9c6f0e86cd97de76cb8e728fdd3d7c4604d41deb Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 10:45:39 -0500 Subject: [PATCH 01/12] Upgrade doc URLs to point directly to DataStax site --- README.rst | 28 ++++++++++++++-------------- cassandra/cluster.py | 2 +- cassandra/io/libevreactor.py | 2 +- docs/object_mapper.rst | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.rst b/README.rst index 8426fa34a7..c769e0bf8a 100644 --- a/README.rst +++ b/README.rst @@ -22,15 +22,15 @@ The driver supports Python 3.9 through 3.13. Features -------- -* `Synchronous `_ and `Asynchronous `_ APIs -* `Simple, Prepared, and Batch statements `_ +* `Synchronous `_ and `Asynchronous `_ APIs +* `Simple, Prepared, and Batch statements `_ * Asynchronous IO, parallel execution, request pipelining -* `Connection pooling `_ +* `Connection pooling `_ * Automatic node discovery -* `Automatic reconnection `_ -* Configurable `load balancing `_ and `retry policies `_ -* `Concurrent execution utilities `_ -* `Object mapper `_ +* `Automatic reconnection `_ +* Configurable `load balancing `_ and `retry policies `_ +* `Concurrent execution utilities `_ +* `Object mapper `_ * `Connecting to DataStax Astra database (cloud) `_ * DSE Graph execution API * DSE Geometric type serialization @@ -43,24 +43,24 @@ Installation through pip is recommended:: $ pip install cassandra-driver For more complete installation instructions, see the -`installation guide `_. +`installation guide `_. Documentation ------------- -The documentation can be found online `here `_. +The documentation can be found online `here `_. A couple of links for getting up to speed: -* `Installation `_ -* `Getting started guide `_ -* `API docs `_ -* `Performance tips `_ +* `Installation `_ +* `Getting started guide `_ +* `API docs `_ +* `Performance tips `_ Object Mapper ------------- cqlengine (originally developed by Blake Eggleston and Jon Haddad, with contributions from the community) is now maintained as an integral part of this package. Refer to -`documentation here `_. +`documentation here `_. Contributing ------------ diff --git a/cassandra/cluster.py b/cassandra/cluster.py index 37dc6598bd..bb1e5da877 100644 --- a/cassandra/cluster.py +++ b/cassandra/cluster.py @@ -1700,7 +1700,7 @@ def protocol_downgrade(self, host_endpoint, previous_version): log.warning("Downgrading core protocol version from %d to %d for %s. " "To avoid this, it is best practice to explicitly set Cluster(protocol_version) to the version supported by your cluster. " - "http://datastax.github.io/python-driver/api/cassandra/cluster.html#cassandra.cluster.Cluster.protocol_version", self.protocol_version, new_version, host_endpoint) + "https://docs.datastax.com/en/developer/python-driver/latest/api/cassandra/cluster.html#cassandra.cluster.Cluster.protocol_version", self.protocol_version, new_version, host_endpoint) self.protocol_version = new_version def connect(self, keyspace=None, wait_for_all_pools=False): diff --git a/cassandra/io/libevreactor.py b/cassandra/io/libevreactor.py index d28c6af0f1..dc3c96e4b7 100644 --- a/cassandra/io/libevreactor.py +++ b/cassandra/io/libevreactor.py @@ -29,7 +29,7 @@ "The C extension needed to use libev was not found. This " "probably means that you didn't have the required build dependencies " "when installing the driver. See " - "http://datastax.github.io/python-driver/installation.html#c-extensions " + "https://docs.datastax.com/en/developer/python-driver/latest/installation.html#c-extensions " "for instructions on installing build dependencies and building " "the C extension.") diff --git a/docs/object_mapper.rst b/docs/object_mapper.rst index 4366c0ad52..21d2954f4b 100644 --- a/docs/object_mapper.rst +++ b/docs/object_mapper.rst @@ -63,7 +63,7 @@ Getting Started description = columns.Text(required=False) #next, setup the connection to your cassandra server(s)... - # see http://datastax.github.io/python-driver/api/cassandra/cluster.html for options + # see https://docs.datastax.com/en/developer/python-driver/latest/api/cassandra/cluster.html for options # the list of hosts will be passed to create a Cluster() instance connection.setup(['127.0.0.1'], "cqlengine", protocol_version=3) From bd06137d364e184d9a699c5b1d7def04918a551f Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 10:50:51 -0500 Subject: [PATCH 02/12] Some additional URL cleanup --- README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index c769e0bf8a..6896cf4711 100644 --- a/README.rst +++ b/README.rst @@ -22,15 +22,15 @@ The driver supports Python 3.9 through 3.13. Features -------- -* `Synchronous `_ and `Asynchronous `_ APIs -* `Simple, Prepared, and Batch statements `_ +* `Synchronous `_ and `Asynchronous `_ APIs +* `Simple, Prepared, and Batch statements `_ * Asynchronous IO, parallel execution, request pipelining -* `Connection pooling `_ +* `Connection pooling `_ * Automatic node discovery -* `Automatic reconnection `_ -* Configurable `load balancing `_ and `retry policies `_ -* `Concurrent execution utilities `_ -* `Object mapper `_ +* `Automatic reconnection `_ +* Configurable `load balancing `_ and `retry policies `_ +* `Concurrent execution utilities `_ +* `Object mapper `_ * `Connecting to DataStax Astra database (cloud) `_ * DSE Graph execution API * DSE Geometric type serialization From df3a3c98cc18ab76bd113e05070486939fdedb27 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:00:30 -0500 Subject: [PATCH 03/12] More URL cleanup --- README.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.rst b/README.rst index 6896cf4711..85f5861529 100644 --- a/README.rst +++ b/README.rst @@ -22,13 +22,13 @@ The driver supports Python 3.9 through 3.13. Features -------- -* `Synchronous `_ and `Asynchronous `_ APIs +* `Synchronous `_ and `Asynchronous `_ APIs * `Simple, Prepared, and Batch statements `_ * Asynchronous IO, parallel execution, request pipelining * `Connection pooling `_ * Automatic node discovery * `Automatic reconnection `_ -* Configurable `load balancing `_ and `retry policies `_ +* Configurable `load balancing `_ and `retry policies `_ * `Concurrent execution utilities `_ * `Object mapper `_ * `Connecting to DataStax Astra database (cloud) `_ @@ -43,7 +43,7 @@ Installation through pip is recommended:: $ pip install cassandra-driver For more complete installation instructions, see the -`installation guide `_. +`installation guide `_. Documentation ------------- @@ -51,16 +51,16 @@ The documentation can be found online `here `_ -* `Getting started guide `_ +* `Installation `_ +* `Getting started guide `_ * `API docs `_ -* `Performance tips `_ +* `Performance tips `_ Object Mapper ------------- cqlengine (originally developed by Blake Eggleston and Jon Haddad, with contributions from the community) is now maintained as an integral part of this package. Refer to -`documentation here `_. +`documentation here `_. Contributing ------------ From 863890ce1d049ac28b471c48c2160611ad116144 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:08:59 -0500 Subject: [PATCH 04/12] A few more README fixes --- README.rst | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 85f5861529..589b52e85c 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ DataStax Driver for Apache Cassandra ==================================== -.. image:: https://travis-ci.com/datastax/python-driver.png?branch=master +.. image:: https://travis-ci.com/datastax/python-driver.svg?branch=master :target: https://travis-ci.com/github/datastax/python-driver A modern, `feature-rich `_ and highly-tunable Python client library for Apache Cassandra (2.1+) and @@ -79,9 +79,8 @@ If you would like to contribute, please feel free to open a pull request. Getting Help ------------ -Your best options for getting help with the driver are the -`mailing list `_ -and the `DataStax Community `_. +Your best options for getting help with the driver is the +`mailing list `_. License ------- From 0148468b6b7ec38c3b3039b8b398d425f9965287 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:12:35 -0500 Subject: [PATCH 05/12] Trying to get the badge fixed --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 589b52e85c..77141cc84b 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ DataStax Driver for Apache Cassandra ==================================== -.. image:: https://travis-ci.com/datastax/python-driver.svg?branch=master +.. |travis-ci| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master :target: https://travis-ci.com/github/datastax/python-driver A modern, `feature-rich `_ and highly-tunable Python client library for Apache Cassandra (2.1+) and From 2751258ae169d0d2a6a5a539b4081fd2129fa7bc Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:13:39 -0500 Subject: [PATCH 06/12] One more time --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 77141cc84b..0d63733596 100644 --- a/README.rst +++ b/README.rst @@ -10,7 +10,7 @@ DataStax Driver for Apache Cassandra ==================================== -.. |travis-ci| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master +.. |travis| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master :target: https://travis-ci.com/github/datastax/python-driver A modern, `feature-rich `_ and highly-tunable Python client library for Apache Cassandra (2.1+) and From 118e41359f4f03ad47706cf6984d6ad30aa91361 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:15:47 -0500 Subject: [PATCH 07/12] Seriously --- README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 0d63733596..1b90f64a7f 100644 --- a/README.rst +++ b/README.rst @@ -4,15 +4,15 @@ .. |version| image:: https://badge.fury.io/py/cassandra-driver.svg :target: https://badge.fury.io/py/cassandra-driver .. |pyversion| image:: https://img.shields.io/pypi/pyversions/cassandra-driver.svg +.. |travis| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master + :target: https://travis-ci.com/github/datastax/python-driver |license| |version| |pyversion| +|travis| DataStax Driver for Apache Cassandra ==================================== -.. |travis| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master - :target: https://travis-ci.com/github/datastax/python-driver - A modern, `feature-rich `_ 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. From c3e4b004db2c639576c798927f48f25817935a77 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:16:48 -0500 Subject: [PATCH 08/12] Please tell me it's not whitespace --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1b90f64a7f..a827f83672 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ :target: https://badge.fury.io/py/cassandra-driver .. |pyversion| image:: https://img.shields.io/pypi/pyversions/cassandra-driver.svg .. |travis| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master - :target: https://travis-ci.com/github/datastax/python-driver + :target: https://travis-ci.com/github/datastax/python-driver |license| |version| |pyversion| |travis| From 65cbde023374c33f67c62d93024b3f313501829c Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:20:48 -0500 Subject: [PATCH 09/12] AGHHH --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index a827f83672..e8ca3cae98 100644 --- a/README.rst +++ b/README.rst @@ -4,7 +4,7 @@ .. |version| image:: https://badge.fury.io/py/cassandra-driver.svg :target: https://badge.fury.io/py/cassandra-driver .. |pyversion| image:: https://img.shields.io/pypi/pyversions/cassandra-driver.svg -.. |travis| image:: https://travis-ci.com/datastax/python-driver.svg?branch=master +.. |travis| image:: https://api.travis-ci.com/datastax/python-driver.svg?branch=master :target: https://travis-ci.com/github/datastax/python-driver |license| |version| |pyversion| From 4c9a272debdc6b0a77f8f985483241b445be2f7e Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:22:11 -0500 Subject: [PATCH 10/12] Okay, does this actually work? --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index e8ca3cae98..2dff975afc 100644 --- a/README.rst +++ b/README.rst @@ -7,8 +7,8 @@ .. |travis| image:: https://api.travis-ci.com/datastax/python-driver.svg?branch=master :target: https://travis-ci.com/github/datastax/python-driver -|license| |version| |pyversion| -|travis| +| |license| |version| |pyversion| +| |travis| DataStax Driver for Apache Cassandra ==================================== From 3d16e708e27a118aa42abfcb8308a3971676a89c Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:23:02 -0500 Subject: [PATCH 11/12] Meh, there's really not a reason to have it on another line --- README.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 2dff975afc..f5085df79b 100644 --- a/README.rst +++ b/README.rst @@ -7,8 +7,7 @@ .. |travis| image:: https://api.travis-ci.com/datastax/python-driver.svg?branch=master :target: https://travis-ci.com/github/datastax/python-driver -| |license| |version| |pyversion| -| |travis| +|license| |version| |pyversion| |travis| DataStax Driver for Apache Cassandra ==================================== From 9f8f17365b862feb7d4bcead8046f0f111fdc556 Mon Sep 17 00:00:00 2001 From: absurdfarce Date: Fri, 19 Sep 2025 11:27:34 -0500 Subject: [PATCH 12/12] One last URL cleanup --- cassandra/io/libevreactor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cassandra/io/libevreactor.py b/cassandra/io/libevreactor.py index dc3c96e4b7..76a830270d 100644 --- a/cassandra/io/libevreactor.py +++ b/cassandra/io/libevreactor.py @@ -29,7 +29,7 @@ "The C extension needed to use libev was not found. This " "probably means that you didn't have the required build dependencies " "when installing the driver. See " - "https://docs.datastax.com/en/developer/python-driver/latest/installation.html#c-extensions " + "https://docs.datastax.com/en/developer/python-driver/latest/installation/index.html#c-extensions " "for instructions on installing build dependencies and building " "the C extension.")