You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2025/12/19 22:57:44 UTC
(cassandra) 01/01: Merge branch 'cassandra-3.11' into cassandra-4.0
This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch cassandra-4.0
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 3c66c74a0f6f6d566d30f472e9898fdd2cb01b3b
Merge: ec3b425c38 0293e8b750
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Fri Dec 19 23:34:19 2025 +0100
Merge branch 'cassandra-3.11' into cassandra-4.0
* cassandra-3.11:
3.x cqlshlib tests broken on python2.7
pylib/requirements.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --cc pylib/requirements.txt
index ebd5937bc0,8b1a81b98c..07fac11aa6
--- a/pylib/requirements.txt
+++ b/pylib/requirements.txt
@@@ -14,16 -14,15 +14,16 @@@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# See python driver docs: futures and six have to be installed before
+#
+#
+# See python driver docs: six have to be installed before
# cythonizing the driver, perhaps only on old pips.
# http://datastax.github.io/python-driver/installation.html#cython-based-extensions
-futures
-six
+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
-cql
+coverage
decorator
docopt
enum34
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org