scylla-cqlsh 6.0.24__tar.gz → 6.0.26__tar.gz

{scylla_cqlsh-6.0.24 → scylla_cqlsh-6.0.26}/.github/workflows/build-push.yml

@@ -11,7 +11,7 @@ on:
       - master
 
 env:
-  CIBW_SKIP: cp36*
+  CIBW_SKIP: cp36* cp37* cp38* pp*
 
 jobs:
   build_wheels:
@@ -20,17 +20,17 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-13, macos-14]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-latest, macos-13, macos-14]
 
     steps:
       - uses: actions/checkout@v4
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.22.0
+        uses: pypa/cibuildwheel@v3.1.3
 
       - uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
+          name: artifacts-wheels-${{ matrix.os }}
           path: ./wheelhouse/*.whl
 
   build_sdist:
@@ -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:
@@ -150,13 +150,13 @@ jobs:
         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,9 +200,10 @@ 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.1.8
+      - uses: actions/download-artifact@v4.1.9
         with:
           path: dist
+          pattern: artifacts-*
           merge-multiple: true
 
       - uses: pypa/gh-action-pypi-publish@release/v1

{scylla_cqlsh-6.0.24 → scylla_cqlsh-6.0.26}/.github/workflows/dockerhub-description.yml

@@ -13,7 +13,7 @@ jobs:
     - 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.24 → scylla_cqlsh-6.0.26}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: scylla-cqlsh
-Version: 6.0.24
+Version: 6.0.26
 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
@@ -20,6 +20,7 @@ License-File: LICENSE.txt
 Requires-Dist: scylla-driver>=3.25.10
 Dynamic: classifier
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 
 # scylla-cqlsh

{scylla_cqlsh-6.0.24 → scylla_cqlsh-6.0.26}/bin/cqlsh.py

@@ -160,7 +160,13 @@ from cqlshlib.util import is_file_secure, trim_if_present
 try:
     from cqlshlib._version import __version__ as version
 except ImportError:
-    version = "0.0.0"
+    # Get the version relative to the current file, suppressing UserWarnings from setuptools_scm
+    from setuptools_scm import get_version
+    
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", UserWarning)
+        version = get_version(root='..', relative_to=__file__, tag_regex=r'^(?P<prefix>v)?(?P<version>[^\+-]+)(?P<suffix>-scylla)?$')
+
 
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042

{scylla_cqlsh-6.0.24 → scylla_cqlsh-6.0.26}/cqlsh/cqlsh.py

@@ -160,7 +160,13 @@ from cqlshlib.util import is_file_secure, trim_if_present
 try:
     from cqlshlib._version import __version__ as version
 except ImportError:
-    version = "0.0.0"
+    # Get the version relative to the current file, suppressing UserWarnings from setuptools_scm
+    from setuptools_scm import get_version
+    
+    with warnings.catch_warnings():
+        warnings.simplefilter("ignore", UserWarning)
+        version = get_version(root='..', relative_to=__file__, tag_regex=r'^(?P<prefix>v)?(?P<version>[^\+-]+)(?P<suffix>-scylla)?$')
+
 
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 9042

{scylla_cqlsh-6.0.24 → scylla_cqlsh-6.0.26}/cqlshlib/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '6.0.24'
-__version_tuple__ = version_tuple = (6, 0, 24)
+__version__ = version = '6.0.26'
+__version_tuple__ = version_tuple = (6, 0, 26)