py-protobuf: pin dependents to @:3 (#30880)

4 files changed, 22 insertions, 3 deletions

diff --git a/var/spack/repos/builtin/packages/py-onnx/package.py b/var/spack/repos/builtin/packages/py-onnx/package.py
index ad167ff539..05a7b2c905 100644
--- a/var/spack/repos/builtin/packages/py-onnx/package.py
+++ b/var/spack/repos/builtin/packages/py-onnx/package.py
@@ -24,9 +24,17 @@ class PyOnnx(PythonPackage):
     version('1.5.0', sha256='1a584a4ef62a6db178c257fffb06a9d8e61b41c0a80bfd8bcd8a253d72c4b0b4')
 
     depends_on('py-setuptools', type='build')
-    # Protobuf version limit is due to https://github.com/protocolbuffers/protobuf/pull/8794
-    depends_on('protobuf@:3.17')
-    depends_on('py-protobuf+cpp@:3.17', type=('build', 'run'))
+    depends_on('protobuf')
+    depends_on('py-protobuf+cpp', type=('build', 'run'))
+    # Protobuf version limit is due to removal of SetTotalBytesLimit in
+    # https://github.com/protocolbuffers/protobuf/pull/8794, fixed in
+    # https://github.com/onnx/onnx/pull/3112
+    depends_on('protobuf@:3.17', when='@:1.8')
+    depends_on('py-protobuf@:3.17', when='@:1.8', type=('build', 'run'))
+    # https://github.com/protocolbuffers/protobuf/issues/10051
+    # https://github.com/onnx/onnx/issues/4222
+    depends_on('protobuf@:3')
+    depends_on('py-protobuf@:3', type=('build', 'run'))
     depends_on('py-numpy', type=('build', 'run'))
     depends_on('py-numpy@1.16.6:', type=('build', 'run'), when='@1.8.1:')
     depends_on('py-six', type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/py-tensorboard/package.py b/var/spack/repos/builtin/packages/py-tensorboard/package.py
index 667ca5d01f..79d0bbdf28 100644
--- a/var/spack/repos/builtin/packages/py-tensorboard/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorboard/package.py
@@ -45,6 +45,9 @@ class PyTensorboard(Package):
     depends_on('py-numpy@1.12.0:', type=('build', 'run'))
     depends_on('py-protobuf@3.6.0:', type=('build', 'run'))
     depends_on('py-protobuf@3.9.2:', type=('build', 'run'), when='@2.9:')
+    # https://github.com/protocolbuffers/protobuf/issues/10051
+    # https://github.com/PyTorchLightning/pytorch-lightning/issues/13159
+    depends_on('py-protobuf@:3', type=('build', 'run'))
     depends_on('py-requests@2.21.0:2', type=('build', 'run'))
     depends_on('py-setuptools@41.0.0:', type=('build', 'run'))
     depends_on('py-tensorboard-data-server@0.6', type=('build', 'run'), when='@2.5:')
diff --git a/var/spack/repos/builtin/packages/py-tensorflow/package.py b/var/spack/repos/builtin/packages/py-tensorflow/package.py
index a9d5b6918a..d84e000f9c 100644
--- a/var/spack/repos/builtin/packages/py-tensorflow/package.py
+++ b/var/spack/repos/builtin/packages/py-tensorflow/package.py
@@ -217,6 +217,10 @@ class PyTensorflow(Package, CudaPackage):
     depends_on('py-protobuf@3.0.0a3', type=('build', 'run'), when='@0.6:0.7.0')
     depends_on('protobuf@:3.12', when='@:2.4')
     depends_on('protobuf@:3.17')
+    # https://github.com/protocolbuffers/protobuf/issues/10051
+    # https://github.com/tensorflow/tensorflow/issues/56266
+    depends_on('py-protobuf@:3', when='@:2.7.2', type=('build', 'run'))
+    depends_on('protobuf@:3', when='@:2.7.2', type=('build', 'run'))
     depends_on('flatbuffers+python@1.12:2', type=('build', 'run'), when='@2.7:')
     depends_on('flatbuffers+python@1.12', type=('build', 'run'), when='@2.4:2.6')
 
diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py
index 3a9b57cc00..62ad1860cd 100644
--- a/var/spack/repos/builtin/packages/py-torch/package.py
+++ b/var/spack/repos/builtin/packages/py-torch/package.py
@@ -120,6 +120,10 @@ class PyTorch(PythonPackage, CudaPackage):
     depends_on('py-protobuf@:3.14', when='@:1.9', type=('build', 'run'))
     depends_on('protobuf@3.12.2:', when='@1.10:')
     depends_on('protobuf@:3.14', when='@:1.9')
+    # https://github.com/protocolbuffers/protobuf/issues/10051
+    # https://github.com/pytorch/pytorch/issues/78362
+    depends_on('py-protobuf@:3', type=('build', 'run'))
+    depends_on('protobuf@:3', type=('build', 'run'))
     depends_on('py-typing-extensions@3.6.2.1:', when='@1.7:', type=('build', 'run'))
     depends_on('blas')
     depends_on('lapack')