Changes to support Cassandra 5.0

cqlsh/__main__.py → cqlshlib/__main__.py

@@ -1,7 +1,7 @@
 import os
 import sys
-from cqlsh.cqlsh import main as cqlsh_main
-from cqlsh.cqlsh import read_options
+from .cqlshmain import main as cqlsh_main
+from .cqlshmain import read_options
 
 def main():
     cqlsh_main(*read_options(sys.argv[1:], os.environ))

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = cqlsh
-version = 6.1.3
+version = 6.2.0
 author = Jeff Widman
 author_email = jeff@jeffwidman.com
 description = cqlsh is a Python-based command-line client for running CQL commands on a cassandra cluster.
@@ -18,19 +18,18 @@ classifiers =
     Operating System :: OS Independent
     Programming Language :: Python
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
+    Programming Language :: Python :: 3.12
 
 [options]
-packages = cqlsh, cqlshlib
-python_requires = >=3.6
+packages = cqlshlib
+python_requires = >=3.8
 
 # Dependencies are in setup.py for GitHub's dependency graph.
 
 [options.entry_points]
 console_scripts =
-  cqlsh = cqlsh.__main__:main
+  cqlsh = cqlshlib.__main__:main

setup.py

@@ -5,5 +5,7 @@
     name="cqlsh",
     install_requires=[
         "cassandra-driver",
+        "pure-sasl",
+        "wcwidth",
     ],
 )