Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Mar 15, 2025. It is now read-only.

Commit 0d596b6

Browse filesBrowse files
partheagcf-owl-bot[bot]
parthea
and
gcf-owl-bot[bot]
authored
fix(deps): allow protobuf 3.19.5 (#188)
* fix(deps): allow protobuf 3.19.5 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 2130558 commit 0d596b6
Copy full SHA for 0d596b6

File tree

Expand file treeCollapse file tree

4 files changed

+58
-7
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

4 files changed

+58
-7
lines changed
Open diff view settings
Collapse file

‎google/cloud/orgpolicy/v1/orgpolicy_pb2.py‎

Copy file name to clipboardExpand all lines: google/cloud/orgpolicy/v1/orgpolicy_pb2.py
+48-4Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@
1717
# Generated by the protocol buffer compiler. DO NOT EDIT!
1818
# source: google/cloud/orgpolicy/v1/orgpolicy.proto
1919
"""Generated protocol buffer code."""
20-
from google.protobuf.internal import builder as _builder
2120
from google.protobuf import descriptor as _descriptor
2221
from google.protobuf import descriptor_pool as _descriptor_pool
22+
from google.protobuf import message as _message
23+
from google.protobuf import reflection as _reflection
2324
from google.protobuf import symbol_database as _symbol_database
2425

2526
# @@protoc_insertion_point(imports)
@@ -36,10 +37,53 @@
3637
b'\n)google/cloud/orgpolicy/v1/orgpolicy.proto\x12\x19google.cloud.orgpolicy.v1\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x1cgoogle/api/annotations.proto"\x8b\x05\n\x06Policy\x12\x0f\n\x07version\x18\x01 \x01(\x05\x12\x12\n\nconstraint\x18\x02 \x01(\t\x12\x0c\n\x04\x65tag\x18\x03 \x01(\x0c\x12/\n\x0bupdate_time\x18\x04 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x43\n\x0blist_policy\x18\x05 \x01(\x0b\x32,.google.cloud.orgpolicy.v1.Policy.ListPolicyH\x00\x12I\n\x0e\x62oolean_policy\x18\x06 \x01(\x0b\x32/.google.cloud.orgpolicy.v1.Policy.BooleanPolicyH\x00\x12K\n\x0frestore_default\x18\x07 \x01(\x0b\x32\x30.google.cloud.orgpolicy.v1.Policy.RestoreDefaultH\x00\x1a\xfb\x01\n\nListPolicy\x12\x16\n\x0e\x61llowed_values\x18\x01 \x03(\t\x12\x15\n\rdenied_values\x18\x02 \x03(\t\x12J\n\nall_values\x18\x03 \x01(\x0e\x32\x36.google.cloud.orgpolicy.v1.Policy.ListPolicy.AllValues\x12\x17\n\x0fsuggested_value\x18\x04 \x01(\t\x12\x1b\n\x13inherit_from_parent\x18\x05 \x01(\x08"<\n\tAllValues\x12\x1a\n\x16\x41LL_VALUES_UNSPECIFIED\x10\x00\x12\t\n\x05\x41LLOW\x10\x01\x12\x08\n\x04\x44\x45NY\x10\x02\x1a!\n\rBooleanPolicy\x12\x10\n\x08\x65nforced\x18\x01 \x01(\x08\x1a\x10\n\x0eRestoreDefaultB\r\n\x0bpolicy_typeB\xcc\x01\n\x1d\x63om.google.cloud.orgpolicy.v1B\x0eOrgPolicyProtoP\x01ZBgoogle.golang.org/genproto/googleapis/cloud/orgpolicy/v1;orgpolicy\xaa\x02\x19Google.Cloud.OrgPolicy.V1\xca\x02\x19Google\\Cloud\\OrgPolicy\\V1\xea\x02\x1cGoogle::Cloud::OrgPolicy::V1b\x06proto3'
3738
)
3839

39-
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
40-
_builder.BuildTopDescriptorsAndMessages(
41-
DESCRIPTOR, "google.cloud.orgpolicy.v1.orgpolicy_pb2", globals()
40+
41+
_POLICY = DESCRIPTOR.message_types_by_name["Policy"]
42+
_POLICY_LISTPOLICY = _POLICY.nested_types_by_name["ListPolicy"]
43+
_POLICY_BOOLEANPOLICY = _POLICY.nested_types_by_name["BooleanPolicy"]
44+
_POLICY_RESTOREDEFAULT = _POLICY.nested_types_by_name["RestoreDefault"]
45+
_POLICY_LISTPOLICY_ALLVALUES = _POLICY_LISTPOLICY.enum_types_by_name["AllValues"]
46+
Policy = _reflection.GeneratedProtocolMessageType(
47+
"Policy",
48+
(_message.Message,),
49+
{
50+
"ListPolicy": _reflection.GeneratedProtocolMessageType(
51+
"ListPolicy",
52+
(_message.Message,),
53+
{
54+
"DESCRIPTOR": _POLICY_LISTPOLICY,
55+
"__module__": "google.cloud.orgpolicy.v1.orgpolicy_pb2"
56+
# @@protoc_insertion_point(class_scope:google.cloud.orgpolicy.v1.Policy.ListPolicy)
57+
},
58+
),
59+
"BooleanPolicy": _reflection.GeneratedProtocolMessageType(
60+
"BooleanPolicy",
61+
(_message.Message,),
62+
{
63+
"DESCRIPTOR": _POLICY_BOOLEANPOLICY,
64+
"__module__": "google.cloud.orgpolicy.v1.orgpolicy_pb2"
65+
# @@protoc_insertion_point(class_scope:google.cloud.orgpolicy.v1.Policy.BooleanPolicy)
66+
},
67+
),
68+
"RestoreDefault": _reflection.GeneratedProtocolMessageType(
69+
"RestoreDefault",
70+
(_message.Message,),
71+
{
72+
"DESCRIPTOR": _POLICY_RESTOREDEFAULT,
73+
"__module__": "google.cloud.orgpolicy.v1.orgpolicy_pb2"
74+
# @@protoc_insertion_point(class_scope:google.cloud.orgpolicy.v1.Policy.RestoreDefault)
75+
},
76+
),
77+
"DESCRIPTOR": _POLICY,
78+
"__module__": "google.cloud.orgpolicy.v1.orgpolicy_pb2"
79+
# @@protoc_insertion_point(class_scope:google.cloud.orgpolicy.v1.Policy)
80+
},
4281
)
82+
_sym_db.RegisterMessage(Policy)
83+
_sym_db.RegisterMessage(Policy.ListPolicy)
84+
_sym_db.RegisterMessage(Policy.BooleanPolicy)
85+
_sym_db.RegisterMessage(Policy.RestoreDefault)
86+
4387
if _descriptor._USE_C_DESCRIPTORS == False:
4488

4589
DESCRIPTOR._options = None
Collapse file

‎noxfile.py‎

Copy file name to clipboardExpand all lines: noxfile.py
+8-1Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,13 @@
2727

2828
BLACK_VERSION = "black==22.3.0"
2929
ISORT_VERSION = "isort==5.10.1"
30+
31+
# NOTE: Pin the version of grpcio-tools to 1.48.2 for compatibility with
32+
# Protobuf 3.19.5. Please ensure that the minimum required version of
33+
# protobuf in setup.py is compatible with the pb2 files generated
34+
# by grpcio-tools before changing the pinned version below.
35+
GRPCIO_TOOLS_VERSION = "grpcio-tools==1.48.2"
36+
3037
LINT_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
3138

3239
DEFAULT_PYTHON_VERSION = "3.8"
@@ -88,7 +95,7 @@ def generate_protos(session):
8895
8996
NOTE: This should be migrated to use bazel in the future.
9097
"""
91-
session.install("grpcio-tools")
98+
session.install(GRPCIO_TOOLS_VERSION)
9299
protos = [str(p) for p in (pathlib.Path(".").glob("google/**/*.proto"))]
93100

94101
session.run(
Collapse file

‎setup.py‎

Copy file name to clipboardExpand all lines: setup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
install_requires=(
4444
"google-api-core[grpc] >= 1.32.0, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.*,!=2.4.*,!=2.5.*,!=2.6.*,!=2.7.*",
4545
"proto-plus >= 1.22.0, <2.0.0dev",
46-
"protobuf >= 3.20.2, <5.0.0dev",
46+
"protobuf>=3.19.5,<5.0.0dev,!=3.20.0,!=3.20.1,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5",
4747
),
4848
python_requires=">=3.7",
4949
classifiers=[
Collapse file

‎testing/constraints-3.7.txt‎

Copy file name to clipboardExpand all lines: testing/constraints-3.7.txt
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# Then this file should have foo==1.14.0
2222
google-api-core==1.32.0
2323
proto-plus==1.22.0
24-
protobuf==3.20.2
24+
protobuf==3.19.5

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.