zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

py-protobuf: add 4.23.3 (#38614)

Browse Source 
* py-protobuf: add 4.23.3

* protobuf: add 3.23.3

* py-protobuf: disable cpp variant for @4.22:
This commit is contained in:
Manuela Kuhn 2023-07-14 17:38:23 +02:00 committed by GitHub
parent 0c986da030
commit ee335c0d53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
var/spack/repos/builtin/packages/abseil-cpp/package.py
View File

@ -15,6 +15,9 @@ class AbseilCpp(CMakePackage):
maintainers("jcftang") maintainers("jcftang")
tags = ["windows"] tags = ["windows"]
version(
"20230125.3", sha256="5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36"
)
version( version(
"20230125.2", sha256="9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906" "20230125.2", sha256="9a2b5752d7bfade0bdeee2701de17c9480620f8b237e1964c1b9967c75374906"
) )

2
var/spack/repos/builtin/packages/protobuf/package.py
View File

@ -14,6 +14,7 @@ class Protobuf(CMakePackage):
url = "https://github.com/protocolbuffers/protobuf/archive/v3.18.0.tar.gz" url = "https://github.com/protocolbuffers/protobuf/archive/v3.18.0.tar.gz"
maintainers("hyoklee") maintainers("hyoklee")
version("3.23.3", sha256="5e4b555f72a7e3f143a7aff7262292500bb02c49b174351684bb70fc7f2a6d33")
version("3.22.2", sha256="2118051b4fb3814d59d258533a4e35452934b1ddb41230261c9543384cbb4dfc") version("3.22.2", sha256="2118051b4fb3814d59d258533a4e35452934b1ddb41230261c9543384cbb4dfc")
version("3.21.12", sha256="930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53") version("3.21.12", sha256="930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53")
version("3.21.9", sha256="1add10f9bd92775b91f326da259f243881e904dd509367d5031d4c782ba82810") version("3.21.9", sha256="1add10f9bd92775b91f326da259f243881e904dd509367d5031d4c782ba82810")
@ -80,6 +81,7 @@ class Protobuf(CMakePackage):
values=("Debug", "Release", "RelWithDebInfo"), values=("Debug", "Release", "RelWithDebInfo"),
) )
depends_on("abseil-cpp@20230125.3:", when="@3.22.5:")
# https://github.com/protocolbuffers/protobuf/issues/11828#issuecomment-1433557509 # https://github.com/protocolbuffers/protobuf/issues/11828#issuecomment-1433557509
depends_on("abseil-cpp@20230125:", when="@3.22:") depends_on("abseil-cpp@20230125:", when="@3.22:")
depends_on("zlib") depends_on("zlib")

5
var/spack/repos/builtin/packages/py-protobuf/package.py
View File

@ -17,10 +17,11 @@ class PyProtobuf(PythonPackage):
homepage = "https://developers.google.com/protocol-buffers/" homepage = "https://developers.google.com/protocol-buffers/"
pypi = "protobuf/protobuf-3.11.0.tar.gz" pypi = "protobuf/protobuf-3.11.0.tar.gz"
variant("cpp", default=True, description="Enable the cpp implementation") variant("cpp", default=True, when="@:4.21", description="Enable the cpp implementation")
# Newer versions seem to require bazel to build? # Newer versions seem to require bazel to build?
# https://github.com/protocolbuffers/protobuf/tree/main/python # https://github.com/protocolbuffers/protobuf/tree/main/python
version("4.23.3", sha256="7a92beb30600332a52cdadbedb40d33fd7c8a0d7f549c440347bc606fb3fe34b")
version("4.21.9", sha256="61f21493d96d2a77f9ca84fefa105872550ab5ef71d21c458eb80edcf4885a99") version("4.21.9", sha256="61f21493d96d2a77f9ca84fefa105872550ab5ef71d21c458eb80edcf4885a99")
version("4.21.7", sha256="71d9dba03ed3432c878a801e2ea51e034b0ea01cf3a4344fb60166cb5f6c8757") version("4.21.7", sha256="71d9dba03ed3432c878a801e2ea51e034b0ea01cf3a4344fb60166cb5f6c8757")
version("4.21.5", sha256="eb1106e87e095628e96884a877a51cdb90087106ee693925ec0a300468a9be3a") version("4.21.5", sha256="eb1106e87e095628e96884a877a51cdb90087106ee693925ec0a300468a9be3a")
@ -68,7 +69,7 @@ class PyProtobuf(PythonPackage):
# Setup dependencies for protobuf to use the same minor version as py-protobuf # Setup dependencies for protobuf to use the same minor version as py-protobuf
# Handle mapping the 4.x release to the protobuf 3.x releases # Handle mapping the 4.x release to the protobuf 3.x releases
for ver in list(range(21, 22)): for ver in list(range(21, 24)):
depends_on("protobuf@3." + str(ver), when="+cpp @4." + str(ver)) depends_on("protobuf@3." + str(ver), when="+cpp @4." + str(ver))
# Handle the 3.x series releases # Handle the 3.x series releases
for ver in list(range(0, 21)): for ver in list(range(0, 21)):