Merge remote-tracking branch 'origin/dev' into CLIENT-1837-cicd-valgr…

…ind-show-leak-kinds-all

.github/actions/update-version/action.yml

@@ -8,10 +8,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-  - name: Update __version__ in aerospike module
-    run: sed -i "s/const char version\[] = \".*\";/const char version\[] = \"${{ inputs.new_version }}\";/" src/main/aerospike.c
-    shell: bash
-
   - name: Update VERSION metadata
     run: echo ${{ inputs.new_version }} > VERSION
     shell: bash

.github/workflows/valgrind.yml

@@ -14,7 +14,11 @@ on:
         default: false
 
 jobs:
+  build-manylinux-wheels:
+    uses: ./.github/workflows/build-wheels.yml
+
   valgrind:
+    needs: build-manylinux-wheels
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
@@ -27,8 +31,12 @@ jobs:
         python-version: '3.8'
         architecture: 'x64'
 
+    - uses: actions/download-artifact@v4
+      with:
+        name: cp38-manylinux_x86_64.build
+
     - name: Install client
-      run: pip install .
+      run: pip install ./*.whl
 
     - name: Install test dependencies
       run: pip install -r test/requirements.txt

BUILD.md

@@ -130,8 +130,6 @@ The local version identifier will appear in:
 - The package version in the wheel name
 - `python3 -m pip show aerospike` if you installed the wheel
 
-The local version identifier will NOT show up in `aerospike.__version__`.
-
 ### Unoptimized builds (only Linux and macOS)
 
 By default, the Python client and the C client submodule are built with optimizations, which can make debugging

VERSION

@@ -1 +1 @@
-15.0.1rc3.dev3
+15.0.1rc3.dev5

doc/aerospike.rst

@@ -1412,12 +1412,6 @@ Bin Types
 Miscellaneous
 -------------
 
-.. data:: __version__
-
-    A :class:`str` containing the module's version.
-
-    .. versionadded:: 1.0.54
-
 .. data:: UDF_TYPE_LUA
 
     UDF type is LUA (which is the only UDF type).

scripts/manylinux2014build.sh

@@ -17,7 +17,7 @@ done
 
 for i in "${ADDR[@]}"; do
     ${i}/pip install aerospike -f /work/wheels/
-    ${i}/python -c "import aerospike; print('Installed aerospike version{}'.format(aerospike.__version__))"
+    ${i}/python -c "import aerospike; from importlib.metadata import version; print('Installed aerospike version{}'.format(version('aerospike')))"
 done
 
 echo "Building wheel $PYTHONS are done"

src/main/aerospike.c

@@ -137,8 +137,6 @@ static int Aerospike_Clear(PyObject *aerospike)
 
 PyMODINIT_FUNC PyInit_aerospike(void)
 {
-
-    const char version[] = "15.0.1rc3.dev3";
     // Makes things "thread-safe"
     Py_Initialize();
     int i = 0;
@@ -161,8 +159,6 @@ PyMODINIT_FUNC PyInit_aerospike(void)
 
     py_global_hosts = PyDict_New();
 
-    PyModule_AddStringConstant(aerospike, "__version__", version);
-
     PyObject *exception = AerospikeException_New();
     Py_INCREF(exception);
     int retval = PyModule_AddObject(aerospike, "exception", exception);

test/new_tests/test_connect.py

@@ -27,12 +27,6 @@ def open_as_connection(config):
 # adds cls.connection_config to this class
 @pytest.mark.usefixtures("connection_config")
 class TestConnect(object):
-    def test_version(self):
-        """
-        Check for aerospike vrsion
-        """
-        assert aerospike.__version__ is not None
-
     def test_connect_positive(self):
         """
         Invoke connect() with positive parameters.