Merge branch 'cassandra-3.11' into cassandra-4.0

* cassandra-3.11:
  3.x cqlshlib tests broken on python2.7

Author: michaelsembwever

pylib/requirements.txt

@@ -20,9 +20,9 @@
 # cythonizing the driver, perhaps only on old pips.
 # http://datastax.github.io/python-driver/installation.html#cython-based-extensions
 six>=1.12.0
--e git+https://github.com/datastax/python-driver.git@cassandra-test#egg=cassandra-driver
+-e git+https://github.com/apache/cassandra-python-driver.git@3.25.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
 decorator
 docopt