From 326ea37c461e49c714b74d7ab05c1a34fdba497c Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 30 Oct 2024 13:26:08 -0700 Subject: [PATCH 1/4] chore: rebuild with and require protobuf 5.28.3 to silence grpc minor version difference warnings vec-420 --- proto/codegen.sh | 2 +- pyproject.toml | 4 ++-- .../shared/proto_generated/auth_pb2_grpc.py | 2 +- .../shared/proto_generated/index_pb2_grpc.py | 2 +- .../shared/proto_generated/transact_pb2_grpc.py | 2 +- .../shared/proto_generated/types_pb2_grpc.py | 2 +- .../shared/proto_generated/user_admin_pb2_grpc.py | 2 +- .../shared/proto_generated/vector_db_pb2_grpc.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/proto/codegen.sh b/proto/codegen.sh index 643db4b5..c307c05b 100755 --- a/proto/codegen.sh +++ b/proto/codegen.sh @@ -3,7 +3,7 @@ cd "$(dirname "$0")" # Generate the gRPC client code -python3 -m pip install grpcio-tools +python3 -m pip install grpcio-tools --upgrade python3 -m grpc_tools.protoc \ --proto_path=. \ --python_out=../src/aerospike_vector_search/shared/proto_generated/ \ diff --git a/pyproject.toml b/pyproject.toml index 15c0bb3d..bbb53d20 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -25,8 +25,8 @@ classifiers = [ version = "3.0.0" requires-python = ">3.8" dependencies = [ - "grpcio == 1.67.0", - "protobuf == 5.28.2", + "grpcio == 1.67.1", + "protobuf == 5.28.3", "pyjwt == 2.9.0", "numpy", "sphinx_rtd_theme" diff --git a/src/aerospike_vector_search/shared/proto_generated/auth_pb2_grpc.py b/src/aerospike_vector_search/shared/proto_generated/auth_pb2_grpc.py index e5f9a269..2dcd88ef 100644 --- a/src/aerospike_vector_search/shared/proto_generated/auth_pb2_grpc.py +++ b/src/aerospike_vector_search/shared/proto_generated/auth_pb2_grpc.py @@ -5,7 +5,7 @@ from . import auth_pb2 as auth__pb2 -GRPC_GENERATED_VERSION = '1.67.0' +GRPC_GENERATED_VERSION = '1.67.1' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/aerospike_vector_search/shared/proto_generated/index_pb2_grpc.py b/src/aerospike_vector_search/shared/proto_generated/index_pb2_grpc.py index da7770b8..9cc1079f 100644 --- a/src/aerospike_vector_search/shared/proto_generated/index_pb2_grpc.py +++ b/src/aerospike_vector_search/shared/proto_generated/index_pb2_grpc.py @@ -7,7 +7,7 @@ from . import index_pb2 as index__pb2 from . import types_pb2 as types__pb2 -GRPC_GENERATED_VERSION = '1.67.0' +GRPC_GENERATED_VERSION = '1.67.1' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/aerospike_vector_search/shared/proto_generated/transact_pb2_grpc.py b/src/aerospike_vector_search/shared/proto_generated/transact_pb2_grpc.py index 28f115b9..bea4a416 100644 --- a/src/aerospike_vector_search/shared/proto_generated/transact_pb2_grpc.py +++ b/src/aerospike_vector_search/shared/proto_generated/transact_pb2_grpc.py @@ -7,7 +7,7 @@ from . import transact_pb2 as transact__pb2 from . import types_pb2 as types__pb2 -GRPC_GENERATED_VERSION = '1.67.0' +GRPC_GENERATED_VERSION = '1.67.1' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/aerospike_vector_search/shared/proto_generated/types_pb2_grpc.py b/src/aerospike_vector_search/shared/proto_generated/types_pb2_grpc.py index 0728fae8..40f9c37d 100644 --- a/src/aerospike_vector_search/shared/proto_generated/types_pb2_grpc.py +++ b/src/aerospike_vector_search/shared/proto_generated/types_pb2_grpc.py @@ -4,7 +4,7 @@ import warnings -GRPC_GENERATED_VERSION = '1.67.0' +GRPC_GENERATED_VERSION = '1.67.1' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/aerospike_vector_search/shared/proto_generated/user_admin_pb2_grpc.py b/src/aerospike_vector_search/shared/proto_generated/user_admin_pb2_grpc.py index 8f465e8d..116bb36c 100644 --- a/src/aerospike_vector_search/shared/proto_generated/user_admin_pb2_grpc.py +++ b/src/aerospike_vector_search/shared/proto_generated/user_admin_pb2_grpc.py @@ -7,7 +7,7 @@ from . import types_pb2 as types__pb2 from . import user_admin_pb2 as user__admin__pb2 -GRPC_GENERATED_VERSION = '1.67.0' +GRPC_GENERATED_VERSION = '1.67.1' GRPC_VERSION = grpc.__version__ _version_not_supported = False diff --git a/src/aerospike_vector_search/shared/proto_generated/vector_db_pb2_grpc.py b/src/aerospike_vector_search/shared/proto_generated/vector_db_pb2_grpc.py index 2b031b8b..381c9a49 100644 --- a/src/aerospike_vector_search/shared/proto_generated/vector_db_pb2_grpc.py +++ b/src/aerospike_vector_search/shared/proto_generated/vector_db_pb2_grpc.py @@ -6,7 +6,7 @@ from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 from . import vector_db_pb2 as vector__db__pb2 -GRPC_GENERATED_VERSION = '1.67.0' +GRPC_GENERATED_VERSION = '1.67.1' GRPC_VERSION = grpc.__version__ _version_not_supported = False From 0fcb2640d222ffd8b880e95b3ec5ae4c9c89d955 Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 30 Oct 2024 13:44:07 -0700 Subject: [PATCH 2/4] ci: trigger tests on PRs and pushes to main --- .github/workflows/extensive_vector_search_tests.yml | 2 +- .github/workflows/integration_test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/extensive_vector_search_tests.yml b/.github/workflows/extensive_vector_search_tests.yml index 2647ae46..41cb0474 100644 --- a/.github/workflows/extensive_vector_search_tests.yml +++ b/.github/workflows/extensive_vector_search_tests.yml @@ -3,7 +3,7 @@ name: Run long running vector search tests on: push: branches: - - dev + - main jobs: test-exhaustive-vector-search: diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index 2684337c..e3178bde 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -3,7 +3,7 @@ name: Run Unit Tests on: pull_request: branches: - - dev + - main push: branches: - main From 06205b7b6d39b28fd0fe63e52be48b1559356716 Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 30 Oct 2024 13:45:24 -0700 Subject: [PATCH 3/4] revert trigger for long running tests (I don't think these are necessary) --- .github/workflows/extensive_vector_search_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/extensive_vector_search_tests.yml b/.github/workflows/extensive_vector_search_tests.yml index 41cb0474..2647ae46 100644 --- a/.github/workflows/extensive_vector_search_tests.yml +++ b/.github/workflows/extensive_vector_search_tests.yml @@ -3,7 +3,7 @@ name: Run long running vector search tests on: push: branches: - - main + - dev jobs: test-exhaustive-vector-search: From 0a1ee3f0c0370edae2b7eda6f8291255b7eda2bb Mon Sep 17 00:00:00 2001 From: dylan Date: Wed, 30 Oct 2024 14:27:29 -0700 Subject: [PATCH 4/4] build: bump version to 3.0.1 --- .github/workflows/integration_test.yml | 2 +- pyproject.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_test.yml b/.github/workflows/integration_test.yml index e3178bde..f9c1bded 100644 --- a/.github/workflows/integration_test.yml +++ b/.github/workflows/integration_test.yml @@ -673,7 +673,7 @@ jobs: - name: Build and install aerospike-vector-search run: | python -m build - pip install dist/aerospike_vector_search-3.0.0-py3-none-any.whl + pip install dist/aerospike_vector_search-3.0.1-py3-none-any.whl - name: Upload to Codecov uses: codecov/codecov-action@v4 diff --git a/pyproject.toml b/pyproject.toml index bbb53d20..57ab665f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,7 +22,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Topic :: Database" ] -version = "3.0.0" +version = "3.0.1" requires-python = ">3.8" dependencies = [ "grpcio == 1.67.1",