Merge branch 'cassandra-5.0' into trunk

michaelsembwever · michaelsembwever · commit f0ae1afbe719 · 2025-12-19T23:55:19.000+01:00
* cassandra-5.0: 3.x cqlshlib tests broken on python2.7
diff --git a/pylib/requirements.txt b/pylib/requirements.txt
@@ -17,9 +17,9 @@
 #
 #
 
--e git+https://github.com/datastax/python-driver.git@3.29.0#egg=cassandra-driver
+-e git+https://github.com/apache/cassandra-python-driver.git@3.29.0#egg=cassandra-driver
 # Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.
--e git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm
+-e git+https://github.com/apache/cassandra-ccm.git@cassandra-test#egg=ccm
 coverage
 pytest
 wcwidth

Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,9 @@`
`17`	`17`	`#`
`18`	`18`	`#`
`19`	`19`
`20`		`--e git+https://github.com/datastax/[email protected]#egg=cassandra-driver`
	`20`	`+-e git+https://github.com/apache/cassandra-[email protected]#egg=cassandra-driver`
`21`	`21`	`# Used ccm version is tracked by cassandra-test branch in ccm repo. Please create a PR there for fixes or upgrades to new releases.`
`22`		`--e git+https://github.com/riptano/ccm.git@cassandra-test#egg=ccm`
	`22`	`+-e git+https://github.com/apache/cassandra-ccm.git@cassandra-test#egg=ccm`
`23`	`23`	`coverage`
`24`	`24`	`pytest`
`25`	`25`	`wcwidth`