scylla-cqlsh 6.0.23__tar.gz → 6.0.25__tar.gz

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/.github/workflows/build-push.yml

@@ -23,14 +23,14 @@ jobs:
         os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.16.5
+        uses: pypa/cibuildwheel@v2.22.0
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
+          name: artifacts-wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -38,7 +38,7 @@ jobs:
     if: contains(github.event.pull_request.labels.*.name, 'test-build') || github.event_name == 'push' && endsWith(github.event.ref, 'scylla')
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Build sdist
         run: |
@@ -46,7 +46,7 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: source-dist
+          name: artifacts-source-dist
           path: dist/*.tar.gz
 
   integration_test_scylla:
@@ -54,7 +54,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-test')"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start Scylla
         run: |
@@ -69,6 +69,7 @@ jobs:
       - name: pytest
         run: |
           pip install -r ./pylib/requirements.txt
+           ./reloc/build_reloc.sh
           pytest ./cqlshlib/test
 
   integration_test_scylla_enterprise:
@@ -76,7 +77,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-test')"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start Scylla
         run: |
@@ -91,6 +92,7 @@ jobs:
       - name: pytest
         run: |
           pip install -r ./pylib/requirements.txt
+           ./reloc/build_reloc.sh
           pytest ./cqlshlib/test
 
   integration_test_scylla_cloud_bundle:
@@ -98,17 +100,13 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-test')"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start Scylla cloud bundle setup with CCM
         run: |
-          # install python2 is needed for scylla < 5.3, cause it bundle with old cqlsh
-          sudo apt update -y
-          sudo apt install -y python2
-          
           python3 -m pip install https://github.com/scylladb/scylla-ccm/archive/master.zip
           
-          ccm create test_sni -i 127.0.1. -n 1 --scylla --version release:5.2
+          ccm create test_sni -i 127.0.1. -n 1 --scylla --version release:6.2
           ccm start --sni-proxy --sni-port=8443
 
           export CQL_TEST_BUNDLE_PATH=$(realpath ~/.ccm/test_sni/config_data.yaml)
@@ -118,6 +116,7 @@ jobs:
       - name: pytest
         run: |
           pip install -r ./pylib/requirements.txt
+           ./reloc/build_reloc.sh
           pytest ./cqlshlib/test
 
   integration_test_cassandra:
@@ -125,7 +124,7 @@ jobs:
     if: "!contains(github.event.pull_request.labels.*.name, 'disable-integration-test')"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Start Scylla
         run: |
@@ -140,6 +139,7 @@ jobs:
       - name: pytest
         run: |
           pip install -r ./pylib/requirements.txt
+           ./reloc/build_reloc.sh
           pytest ./cqlshlib/test
 
   docker:
@@ -147,16 +147,16 @@ jobs:
     if: github.event_name == 'push'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
@@ -171,7 +171,7 @@ jobs:
 
       - name: Build and push release
         if: endsWith(github.event.ref, '-scylla')
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
@@ -182,7 +182,7 @@ jobs:
             scylladb/scylla-cqlsh:latest
 
       - name: Build and push master
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         if: endsWith(github.event.ref, 'master')
         with:
           context: .
@@ -200,13 +200,13 @@ jobs:
     # alternatively, to publish when a GitHub Release is created, use the following rule:
     # if: github.event_name == 'release' && github.event.action == 'published'
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v4.1.8
         with:
           path: dist
+          pattern: artifacts-*
           merge-multiple: true
 
       - uses: pypa/gh-action-pypi-publish@release/v1
         with:
-          skip-existing: true
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/.github/workflows/dockerhub-description.yml

@@ -10,10 +10,10 @@ jobs:
   dockerHubDescription:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Docker Hub Description
-      uses: peter-evans/dockerhub-description@v3
+      uses: peter-evans/dockerhub-description@v4
       with:
         username: ${{ secrets.DOCKER_HUB_USERNAME }}
         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.11-slim-bullseye AS compile-image
+FROM python:3.13-slim-bullseye AS compile-image
 
 WORKDIR /usr/src/app
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y install --no-install-recommends git gcc libc6-dev
@@ -7,7 +7,7 @@ COPY . .
 RUN pip install --user .
 
 
-FROM python:3.11-slim-bullseye AS build-image
+FROM python:3.13-slim-bullseye AS build-image
 
 # Upgrade packages to the latest, pip as well.
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get -y upgrade && apt-get clean && rm -rf /var/lib/apt/lists/*

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: scylla-cqlsh
-Version: 6.0.23
+Version: 6.0.25
 Summary: cqlsh is a Python-based command-line client for running CQL commands on a scylla cluster.
 Home-page: https://github.com/scylladb/scylla-cqlsh
 Author: Israel Fruchter
@@ -18,6 +18,9 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: scylla-driver>=3.25.10
+Dynamic: classifier
+Dynamic: license
+Dynamic: requires-dist
 
 # scylla-cqlsh
 

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/bin/cqlsh.py

@@ -32,6 +32,7 @@ import sys
 import traceback
 import warnings
 import webbrowser
+import logging
 from contextlib import contextmanager
 from glob import glob
 from io import StringIO
@@ -201,6 +202,8 @@ parser.add_option('-k', '--keyspace', help='Authenticate to the given keyspace.'
 parser.add_option("-f", "--file", help="Execute commands from FILE, then exit")
 parser.add_option('--debug', action='store_true',
                   help='Show additional debugging information')
+parser.add_option('--driver-debug', action='store_true',
+                  help='Show additional driver debugging information')
 parser.add_option('--coverage', action='store_true',
                   help='Collect coverage data')
 parser.add_option("--encoding", help="Specify a non-default encoding for output."
@@ -2472,7 +2475,7 @@ def read_options(cmdlineargs, environment):
     optvalues.timezone = option_with_default(configs.get, 'ui', 'timezone', None)
 
     optvalues.debug = False
-
+    optvalues.driver_debug = False
     optvalues.coverage = False
     if 'CQLSH_COVERAGE' in environment.keys():
         optvalues.coverage = True
@@ -2625,6 +2628,11 @@ def save_history():
 
 
 def main(options, hostname, port):
+    if options.driver_debug:
+        logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+                            stream=sys.stdout)
+        logging.getLogger("cassandra").setLevel(logging.DEBUG)
+
     setup_cqlruleset(options.cqlmodule)
     setup_cqldocs(options.cqlmodule)
     init_history()

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/cqlsh/cqlsh.py

@@ -32,6 +32,7 @@ import sys
 import traceback
 import warnings
 import webbrowser
+import logging
 from contextlib import contextmanager
 from glob import glob
 from io import StringIO
@@ -201,6 +202,8 @@ parser.add_option('-k', '--keyspace', help='Authenticate to the given keyspace.'
 parser.add_option("-f", "--file", help="Execute commands from FILE, then exit")
 parser.add_option('--debug', action='store_true',
                   help='Show additional debugging information')
+parser.add_option('--driver-debug', action='store_true',
+                  help='Show additional driver debugging information')
 parser.add_option('--coverage', action='store_true',
                   help='Collect coverage data')
 parser.add_option("--encoding", help="Specify a non-default encoding for output."
@@ -2472,7 +2475,7 @@ def read_options(cmdlineargs, environment):
     optvalues.timezone = option_with_default(configs.get, 'ui', 'timezone', None)
 
     optvalues.debug = False
-
+    optvalues.driver_debug = False
     optvalues.coverage = False
     if 'CQLSH_COVERAGE' in environment.keys():
         optvalues.coverage = True
@@ -2625,6 +2628,11 @@ def save_history():
 
 
 def main(options, hostname, port):
+    if options.driver_debug:
+        logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+                            stream=sys.stdout)
+        logging.getLogger("cassandra").setLevel(logging.DEBUG)
+
     setup_cqlruleset(options.cqlmodule)
     setup_cqldocs(options.cqlmodule)
     init_history()

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/cqlshlib/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.0.23'
-__version_tuple__ = version_tuple = (6, 0, 23)
+__version__ = version = '6.0.25'
+__version_tuple__ = version_tuple = (6, 0, 25)

scylla_cqlsh-6.0.25/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/requirements.txt

@@ -1,3 +1,3 @@
-scylla-driver==3.26.9
+scylla-driver==3.28.0
 PyYAML>=6.0.1
 click>=8.1.3

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/scylla_cqlsh.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: scylla-cqlsh
-Version: 6.0.23
+Version: 6.0.25
 Summary: cqlsh is a Python-based command-line client for running CQL commands on a scylla cluster.
 Home-page: https://github.com/scylladb/scylla-cqlsh
 Author: Israel Fruchter
@@ -18,6 +18,9 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
 Requires-Dist: scylla-driver>=3.25.10
+Dynamic: classifier
+Dynamic: license
+Dynamic: requires-dist
 
 # scylla-cqlsh
 

{scylla_cqlsh-6.0.23 → scylla_cqlsh-6.0.25}/scylla_cqlsh.egg-info/SOURCES.txt

@@ -8,6 +8,7 @@ cqlshlib
 install-dependencies.sh
 install.sh
 pyproject.toml
+renovate.json
 requirements.txt
 setup.cfg
 setup.py
@@ -43,9 +44,6 @@ dist/debian/debian/rules
 dist/debian/debian/source/format
 dist/debian/debian/source/options
 dist/redhat/scylla-cqlsh.spec
-pylib/Dockerfile.ubuntu.py3
-pylib/Dockerfile.ubuntu.py37
-pylib/Dockerfile.ubuntu.py38
 pylib/README.asc
 pylib/cassandra-cqlsh-tests.sh
 pylib/requirements.txt

scylla_cqlsh-6.0.23/pylib/Dockerfile.ubuntu.py3

@@ -1,2 +0,0 @@
-FROM ubuntu:bionic
-RUN apt-get update && apt-get install -y python3-minimal && update-alternatives --install /usr/bin/python python /usr/bin/python3.6 1

scylla_cqlsh-6.0.23/pylib/Dockerfile.ubuntu.py37

@@ -1,2 +0,0 @@
-FROM ubuntu:bionic
-RUN apt-get update && apt-get install -y python3.7-minimal && update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1

scylla_cqlsh-6.0.23/pylib/Dockerfile.ubuntu.py38

@@ -1,2 +0,0 @@
-FROM ubuntu:bionic
-RUN apt-get update && apt-get install -y python3.8-minimal && update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1