resolve conflicts with master

.github/workflows/tests.yml

@@ -0,0 +1,61 @@
+name: Pytest Tests
+on:
+  push:
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: recursive
+    - name: Set up Aerospike Database
+      uses: reugn/github-action-aerospike@dev
+      with:
+        port: 3000
+        # config-file: 'test/test-instance-data/aerospike.conf'
+        # feature-key-file: 'test/test-instance-data/features.conf'
+    - uses: actions/setup-python@v2
+      with:
+        python-version: '3.9'
+        architecture: 'x64'
+    - name: Print Python debug info
+      run: python --version
+    - name: Setup test config file
+      run: |
+        sudo apt-get install jq
+        cd test
+        CID=$(docker ps -a | grep 'aerospike-server' | awk 'NF>1{print $NF}')
+        echo $CID
+        CIP=$(docker inspect -f '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $CID)
+        echo $CIP
+        python - <<EOF
+        import configparser
+        config = configparser.ConfigParser(delimiters=(":"))
+        config["enterprise-edition"] = {"hosts": "", "user": "", "password": ""}
+        config["community-edition"] = {"hosts": "$CIP" + ":3000"}
+        with open("config.conf", "w") as conf:
+            config.write(conf)
+        EOF
+        cat ./config.conf
+        cd ..
+    - name: Print Docker debug info
+      run: |
+        docker inspect gha_aerospike
+        docker ps
+        docker ps -a
+        docker logs --tail all gha_aerospike
+    - name: Install dependencies
+      run: |
+        sudo apt-get install libssl-dev
+        sudo apt-get install python3-dev
+        python -m pip install pytest
+    - name: Build client
+      run: |
+        python setup.py build --force
+    - name: Install client
+      run: |
+        python setup.py install --force
+    - name: Run tests 
+      run: |
+        cd test
+        python -m pytest ./new_tests

.gitmodules

@@ -2,4 +2,4 @@
 	path = aerospike-client-c
 	#url = git@github.com:aerospike/aerospike-client-c.git
 	url = https://github.com/aerospike/aerospike-client-c.git
-	branch = master
+	branch = stage

VERSION

@@ -1 +1 @@
-6.1.2
+7.0.0

aerospike_helpers/batch/__init__.py

@@ -0,0 +1,15 @@
+##########################################################################
+# Copyright 2013-2022 Aerospike, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+##########################################################################