Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion librarian.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
language: python
version: v0.31.0
version: v0.33.0
repo: googleapis/google-cloud-python
sources:
googleapis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,25 @@
# limitations under the License.

# Generated by the protocol buffer compiler. DO NOT EDIT!
# NO CHECKED-IN PROTOBUF GENCODE
# source: google/identity/accesscontextmanager/type/device_resources.proto
# Protobuf Python Version: 4.25.3
# Protobuf Python Version: 6.33.2

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean you are using a different version of protobuf locally than was previously used for this language?

Curious that other than the shopping/merchant title updates, the only changes are in type-only packages and just to the pb2.py code...something isn't right here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok so this is a good call out, I'm using the new workflow so it's helpful to point out what's changed. Since we're no longer using the docker container to generate, we're using the local version, and this is my local version of protoc:

$ which protoc
/usr/local/google/home/sofialeon/.protoc_33.2/bin/protoc

which maps to protobuf 6.33.2.

This is what other languages (Rust, Go) use as well. However, since it wasn't listed in python's (new) librarian.yaml, it just defaulted to my locally installed path.

I found this which makes me think the team actually did want to upgrade, but it was merged last week, and then we got rid of the embedded yaml, so I think it didn't get implemented. All this to say, @daniel-sanche, would you be ok with bumping the version of protoc in this PR, since it seems that was the intention anyways, but to what other languages are using? Alternatively we could just specify the version of protoc in the librarian.yaml to 33.5 and regenerate later.

"""Generated protocol buffer code."""

from google.protobuf import descriptor as _descriptor
from google.protobuf import descriptor_pool as _descriptor_pool
from google.protobuf import runtime_version as _runtime_version
from google.protobuf import symbol_database as _symbol_database
from google.protobuf.internal import builder as _builder

_runtime_version.ValidateProtobufRuntimeVersion(
_runtime_version.Domain.PUBLIC,
6,
33,
2,
"",
"google/identity/accesscontextmanager/type/device_resources.proto",
)
# @@protoc_insertion_point(imports)

_sym_db = _symbol_database.Default()
Expand All @@ -40,8 +50,8 @@
"google.identity.accesscontextmanager.type.device_resources_pb2",
_globals,
)
if _descriptor._USE_C_DESCRIPTORS == False:
_globals["DESCRIPTOR"]._options = None
if not _descriptor._USE_C_DESCRIPTORS:
_globals["DESCRIPTOR"]._loaded_options = None
_globals[
"DESCRIPTOR"
]._serialized_options = b"\n-com.google.identity.accesscontextmanager.typeB\tTypeProtoP\001ZHgoogle.golang.org/genproto/googleapis/identity/accesscontextmanager/type\252\002)Google.Identity.AccessContextManager.Type\312\002)Google\\Identity\\AccessContextManager\\Type\352\002,Google::Identity::AccessContextManager::Type"
Expand Down
Loading
Loading