Merge branch 'main' into release-please--branches--main

busunkim96 · web-flow · commit 28dc6e4dc681 · 2022-02-02T13:19:48.000-07:00
diff --git a/setup.py b/setup.py
@@ -33,7 +33,6 @@
     "protobuf >= 3.12.0",
     "google-auth >= 1.25.0, < 3.0dev",
     "requests >= 2.18.0, < 3.0.0dev",
-    "setuptools >= 40.3.0",
 ]
 extras = {
     "grpc": ["grpcio >= 1.33.2, < 2.0dev", "grpcio-status >= 1.33.2, < 2.0dev"],
diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt
@@ -9,7 +9,6 @@ googleapis-common-protos==1.52.0
 protobuf==3.12.0
 google-auth==1.25.0
 requests==2.18.0
-setuptools==40.3.0
 packaging==14.3
 grpcio==1.33.2
 grpcio-gcp==0.2.2

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@`
`33`	`33`	`"protobuf >= 3.12.0",`
`34`	`34`	`"google-auth >= 1.25.0, < 3.0dev",`
`35`	`35`	`"requests >= 2.18.0, < 3.0.0dev",`
`36`		`- "setuptools >= 40.3.0",`
`37`	`36`	`]`
`38`	`37`	`extras = {`
`39`	`38`	`"grpc": ["grpcio >= 1.33.2, < 2.0dev", "grpcio-status >= 1.33.2, < 2.0dev"],`