Downgrade protobuf dep (#204)

* downgrade * update
OpenMined · Oct 2, 2024 · 3d26c4e · 3d26c4e
1 parent 791d44b
commit 3d26c4e
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 929 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -2,7 +2,24 @@
 
 Feat:
 
-- Add support for python 3.12
+- Add support for Python 3.12
+
+Fix:
+
+- There was a bug in the pybind11 bindings involving incorrect usage for
+  releasing the GIL lock which led to a segfault when using Python 3.12.
+  Previous versions remain unaffected.
+- Pin the python `protobuf` version to match
+  [`rules_proto_grpc_python`](https://github.com/rules-proto-grpc/rules_proto_grpc/blob/master/modules/python/requirements.in#L3)
+  to remove runtime warnings.
+
+Chore:
+
+- Removed `macos-12` from the `CD` GHA as it was building with an incorrect
+  wheel name for the given OS. We're only building/publishing wheels for
+  `macos-14`.
+- Removed unused pip deps from `requirements.in` and updated lock files
+  accordingly.
 
 # Version 2.0.4
 

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -23,7 +23,6 @@ bazel_dep(name = "rules_cc", version = "0.0.10")
 bazel_dep(name = "rules_go", version = "0.50.1")
 bazel_dep(name = "rules_java", version = "7.12.0")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
-bazel_dep(name = "rules_proto", version = "6.0.2")
 bazel_dep(name = "rules_proto_grpc", version = "5.0.0")
 bazel_dep(name = "rules_proto_grpc_cpp", version = "5.0.0")
 bazel_dep(name = "rules_proto_grpc_go", version = "5.0.0")
@@ -34,9 +33,9 @@ bazel_dep(name = "rules_rust", version = "0.51.0")
 ## PCJ
 http_archive(
     name = "private_join_and_compute",
-    sha256 = "4a2916c42af1d32d3a94799703a81b11e05dbf1d4e0021e25f181d5921f667bf",
-    strip_prefix = "private-join-and-compute-1225a27f13fb39359242db3da3c090b81d24cced",
-    url = "https://github.com/s0l0ist/private-join-and-compute/archive/1225a27f13fb39359242db3da3c090b81d24cced.zip",
+    sha256 = "a53b9db35ad42aaf8a778a859915e5cca08f33800c314f04b3fcb0f2c5e148b3",
+    strip_prefix = "private-join-and-compute-e81563e0e3caa0f6178e8668be8a4434d2cef352",
+    url = "https://github.com/s0l0ist/private-join-and-compute/archive/e81563e0e3caa0f6178e8668be8a4434d2cef352.zip",
 )
 
 ## Python

diff --git a/private_set_intersection/javascript/src/__tests__/integration.test.ts b/private_set_intersection/javascript/src/__tests__/integration.test.ts
@@ -1,5 +1,5 @@
-import PSI from '../wasm_node'
 import { PSILibrary } from '../implementation/psi'
+import PSI from '../wasm_node'
 
 const clientKey = Uint8Array.from([
   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
@@ -85,7 +85,7 @@ describe('PSI Integration', () => {
             numClientElements / 2
           )
           // eslint-disable-next-line jest/no-conditional-expect
-          expect(intersection.length).toBeLessThan(
+          expect(intersection.length).toBeLessThanOrEqual(
             (numClientElements / 2) * 1.1
           )
         }

diff --git a/private_set_intersection/proto/BUILD b/private_set_intersection/proto/BUILD
@@ -14,9 +14,9 @@
 # limitations under the License.
 #
 
+load("@protobuf//bazel:proto_library.bzl", "proto_library")
 load("@rules_cc//cc:defs.bzl", "cc_proto_library")
 load("@rules_go//go:def.bzl", "go_library")
-load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@rules_proto_grpc_go//:defs.bzl", "go_proto_library")
 load("@rules_proto_grpc_python//:defs.bzl", "python_proto_library")
 load("@rules_rust//proto/protobuf:defs.bzl", "rust_proto_library")

diff --git a/private_set_intersection/python/BUILD b/private_set_intersection/python/BUILD
@@ -204,7 +204,8 @@ py_wheel(
     }),
     python_requires = ">=3.8",
     python_tag = python_abi(),
-    requires = ["protobuf"],
+    # NOTE: Keep this in sync with `requirements.in`
+    requires = ["protobuf==5.27.2"],
     twine = "@publish_deps//twine",
     version = VERSION_LABEL,
     deps = [

diff --git a/private_set_intersection/python/requirements/requirements.in b/private_set_intersection/python/requirements/requirements.in
@@ -1,5 +1,4 @@
 pytest
 pytest-benchmark
-twine
-packaging
-protobuf
+# This is the latest version specified by rules_proto_grpc_python
+protobuf==5.27.2
diff --git a/private_set_intersection/python/requirements/requirements_lock_3_10.txt b/private_set_intersection/python/requirements/requirements_lock_3_10.txt
diff --git a/private_set_intersection/python/requirements/requirements_lock_3_11.txt b/private_set_intersection/python/requirements/requirements_lock_3_11.txt
diff --git a/private_set_intersection/python/requirements/requirements_lock_3_12.txt b/private_set_intersection/python/requirements/requirements_lock_3_12.txt
@@ -178,18 +178,18 @@ pluggy==1.5.0 \
     --hash=sha256:2cffa88e94fdc978c4c574f15f9e59b7f4201d439195c3715ca9e2486f1d0cf1 \
     --hash=sha256:44e1ad92c8ca002de6377e165f3e0f1be63266ab4d554740532335b9d75ea669
     # via pytest
-protobuf==5.28.2 \
-    --hash=sha256:2c69461a7fcc8e24be697624c09a839976d82ae75062b11a0972e41fd2cd9132 \
-    --hash=sha256:35cfcb15f213449af7ff6198d6eb5f739c37d7e4f1c09b5d0641babf2cc0c68f \
-    --hash=sha256:52235802093bd8a2811abbe8bf0ab9c5f54cca0a751fdd3f6ac2a21438bffece \
-    --hash=sha256:59379674ff119717404f7454647913787034f03fe7049cbef1d74a97bb4593f0 \
-    --hash=sha256:5e8a95246d581eef20471b5d5ba010d55f66740942b95ba9b872d918c459452f \
-    --hash=sha256:87317e9bcda04a32f2ee82089a204d3a2f0d3c8aeed16568c7daf4756e4f1fe0 \
-    --hash=sha256:8ddc60bf374785fb7cb12510b267f59067fa10087325b8e1855b898a0d81d276 \
-    --hash=sha256:a8b9403fc70764b08d2f593ce44f1d2920c5077bf7d311fefec999f8c40f78b7 \
-    --hash=sha256:c0ea0123dac3399a2eeb1a1443d82b7afc9ff40241433296769f7da42d142ec3 \
-    --hash=sha256:ca53faf29896c526863366a52a8f4d88e69cd04ec9571ed6082fa117fac3ab36 \
-    --hash=sha256:eeea10f3dc0ac7e6b4933d32db20662902b4ab81bf28df12218aa389e9c2102d
+protobuf==5.27.2 \
+    --hash=sha256:0e341109c609749d501986b835f667c6e1e24531096cff9d34ae411595e26505 \
+    --hash=sha256:176c12b1f1c880bf7a76d9f7c75822b6a2bc3db2d28baa4d300e8ce4cde7409b \
+    --hash=sha256:354d84fac2b0d76062e9b3221f4abbbacdfd2a4d8af36bab0474f3a0bb30ab38 \
+    --hash=sha256:4fadd8d83e1992eed0248bc50a4a6361dc31bcccc84388c54c86e530b7f58863 \
+    --hash=sha256:54330f07e4949d09614707c48b06d1a22f8ffb5763c159efd5c0928326a91470 \
+    --hash=sha256:610e700f02469c4a997e58e328cac6f305f649826853813177e6290416e846c6 \
+    --hash=sha256:7fc3add9e6003e026da5fc9e59b131b8f22b428b991ccd53e2af8071687b4fce \
+    --hash=sha256:9e8f199bf7f97bd7ecebffcae45ebf9527603549b2b562df0fbc6d4d688f14ca \
+    --hash=sha256:a109916aaac42bff84702fb5187f3edadbc7c97fc2c99c5ff81dd15dcce0d1e5 \
+    --hash=sha256:b848dbe1d57ed7c191dfc4ea64b8b004a3f9ece4bf4d0d80a367b76df20bf36e \
+    --hash=sha256:f3ecdef226b9af856075f28227ff2c90ce3a594d092c39bee5513573f25e2714
     # via -r private_set_intersection/python/requirements/requirements.in
 py-cpuinfo==9.0.0 \
     --hash=sha256:3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690 \
@@ -229,9 +229,9 @@ rfc3986==2.0.0 \
     --hash=sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd \
     --hash=sha256:97aacf9dbd4bfd829baad6e6309fa6573aaf1be3f6fa735c8ab05e46cecb261c
     # via twine
-rich==13.8.1 \
-    --hash=sha256:1760a3c0848469b97b558fc61c85233e3dafb69c7a071b4d60c38099d3cd4c06 \
-    --hash=sha256:8260cda28e3db6bf04d2d1ef4dbc03ba80a824c88b0e7668a0f23126a424844a
+rich==13.9.1 \
+    --hash=sha256:097cffdf85db1babe30cc7deba5ab3a29e1b9885047dab24c57e9a7f8a9c1466 \
+    --hash=sha256:b340e739f30aa58921dc477b8adaa9ecdb7cecc217be01d93730ee1bc8aa83be
     # via twine
 twine==5.1.1 \
     --hash=sha256:215dbe7b4b94c2c50a7315c0275d2258399280fbb7d04182c7e55e24b5f93997 \