From 67693273d2778082732705d12f1e4db112b42a62 Mon Sep 17 00:00:00 2001
From: Liu <96442646+liuverta@users.noreply.github.com>
Date: Wed, 27 Jul 2022 16:16:02 -0700
Subject: [PATCH 1/3] chore: Allow protobug < 4.0

---
 client/verta/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/verta/requirements.txt b/client/verta/requirements.txt
index 4c6fda7504..8ef9ac5c95 100644
--- a/client/verta/requirements.txt
+++ b/client/verta/requirements.txt
@@ -2,7 +2,7 @@ click >= 7.0, < 9.0
 cloudpickle ~= 1.0
 googleapis-common-protos >= 1.5, < 2.0
 pathlib2 >= 2.2, < 3.0
-protobuf >= 3.8, < 3.18
+protobuf >= 3.8, < 4.0
 pytimeparse >= 1.1.8, < 2.0
 pyyaml >= 5.1, < 6.0
 requests >= 2.21, < 3.0

From 3d197eb293aaf407c1d39f0f798b7d83b8f99f77 Mon Sep 17 00:00:00 2001
From: Michael Liu <miliu@verta.ai>
Date: Thu, 28 Jul 2022 09:54:19 -0700
Subject: [PATCH 2/3] Remove no-space-check

---
 client/verta/.pylintrc | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/client/verta/.pylintrc b/client/verta/.pylintrc
index be8766f17b..7b516954b2 100644
--- a/client/verta/.pylintrc
+++ b/client/verta/.pylintrc
@@ -351,13 +351,6 @@ max-line-length=100
 # Maximum number of lines in a module
 max-module-lines=1000
 
-# List of optional constructs for which whitespace checking is disabled. `dict-
-# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
-# `trailing-comma` allows a space between comma and closing bracket: (a, ).
-# `empty-line` allows space-only lines.
-no-space-check=trailing-comma,
-               dict-separator
-
 # Allow the body of a class to be on the same line as the declaration if body
 # contains single statement.
 single-line-class-stmt=no

From 38569db2f0060937e30a2b523e436e39f633baab Mon Sep 17 00:00:00 2001
From: Michael Liu <miliu@verta.ai>
Date: Thu, 28 Jul 2022 10:02:22 -0700
Subject: [PATCH 3/3] Ignore protobuf.struct_pb2 in pylint

---
 client/verta/.pylintrc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/verta/.pylintrc b/client/verta/.pylintrc
index 7b516954b2..6194a52e63 100644
--- a/client/verta/.pylintrc
+++ b/client/verta/.pylintrc
@@ -285,7 +285,8 @@ ignored-classes=optparse.Values,
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis. It
 # supports qualified module names, as well as Unix pattern matching.
-ignored-modules=verta._protos.*
+ignored-modules=verta._protos.*,
+                google.protobuf.struct_pb2,
 
 # Show a hint with possible names when a member name was not found. The aspect
 # of finding the hint is based on edit distance.