Skip to content

Commit

Permalink
Merge remote-tracking branch 'sasha-gitg/fix_v1_conversion_rule' into…
Browse files Browse the repository at this point in the history
… mor--compat-v1
  • Loading branch information
morgandu committed Apr 6, 2021
2 parents 15af9f1 + 793602f commit 32063eb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions google/cloud/aiplatform/helpers/_decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,5 @@ def _from_map(map_):

marshal = Marshal(name="google.cloud.aiplatform.v1beta1")
marshal.register(Value, ConversionValueRule(marshal=marshal))
marshal = Marshal(name="google.cloud.aiplatform.v1")
marshal.register(Value, ConversionValueRule(marshal=marshal))
2 changes: 1 addition & 1 deletion samples/snippets/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pytest==6.2.2
google-cloud-storage>=1.26.0, <2.0.0dev
google-cloud-aiplatform==0.5.1
google-cloud-aiplatform==0.6.0

0 comments on commit 32063eb

Please sign in to comment.