From fd1f796578093faf3b55bd153e982f5e7a325714 Mon Sep 17 00:00:00 2001
From: "Leah E. Cole" <6719667+leahecole@users.noreply.github.com>
Date: Tue, 19 Jul 2022 12:49:22 -0400
Subject: [PATCH] docs(samples): explicitly add bq to samples reqs, upgrade
 grpc to fix bug on m1 (#1290)

* fix: explicitly add bq to samples reqs, upgrade grpc to fix bug on m1

* update grpc in setup.py

* fix: rm 3.6 constraints, add grpcio to 3.7-3.10 constraints
---
 samples/snippets/requirements.txt |  3 ++-
 setup.py                          |  2 +-
 testing/constraints-3.10.txt      |  1 +
 testing/constraints-3.6.txt       | 27 ---------------------------
 testing/constraints-3.7.txt       |  2 +-
 testing/constraints-3.8.txt       |  1 +
 testing/constraints-3.9.txt       |  1 +
 7 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 testing/constraints-3.6.txt

diff --git a/samples/snippets/requirements.txt b/samples/snippets/requirements.txt
index ad64565e2..a8322de0a 100644
--- a/samples/snippets/requirements.txt
+++ b/samples/snippets/requirements.txt
@@ -1,7 +1,8 @@
 db-dtypes==1.0.1
+google-cloud-bigquery==3.2.0
 google-cloud-bigquery-storage==2.13.1
 google-auth-oauthlib==0.5.1
-grpcio==1.46.3
+grpcio==1.47.0
 ipython===7.31.1; python_version == '3.7'
 ipython===8.0.1; python_version == '3.8'
 ipython==8.3.0; python_version >= '3.9'
diff --git a/setup.py b/setup.py
index a3d5c829e..f811a47b1 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
 # 'Development Status :: 5 - Production/Stable'
 release_status = "Development Status :: 5 - Production/Stable"
 dependencies = [
-    "grpcio >= 1.38.1, < 2.0dev",  # https://github.com/googleapis/python-bigquery/issues/695
+    "grpcio >= 1.47.0, < 2.0dev",  # https://github.com/googleapis/python-bigquery/issues/1262
     # NOTE: Maintainers, please do not require google-api-core>=2.x.x
     # Until this issue is closed
     # https://github.com/googleapis/google-cloud-python/issues/10566
diff --git a/testing/constraints-3.10.txt b/testing/constraints-3.10.txt
index e69de29bb..c5e37fc9b 100644
--- a/testing/constraints-3.10.txt
+++ b/testing/constraints-3.10.txt
@@ -0,0 +1 @@
+grpcio==1.47.0
diff --git a/testing/constraints-3.6.txt b/testing/constraints-3.6.txt
deleted file mode 100644
index 47b842a6d..000000000
--- a/testing/constraints-3.6.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# This constraints file is used to check that lower bounds
-# are correct in setup.py
-# List *all* library dependencies and extras in this file.
-# Pin the version to the lower bound.
-#
-# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
-# Then this file should have foo==1.14.0
-db-dtypes==0.3.0
-geopandas==0.9.0
-google-api-core==1.31.5
-google-cloud-bigquery-storage==2.0.0
-google-cloud-core==1.4.1
-google-resumable-media==0.6.0
-grpcio==1.38.1
-ipython==7.0.1
-opentelemetry-api==1.1.0
-opentelemetry-instrumentation==0.20b0
-opentelemetry-sdk==1.1.0
-pandas==1.0.0
-proto-plus==1.15.0
-protobuf==3.12.0
-pyarrow==3.0.0
-python-dateutil==2.7.2
-requests==2.18.0
-Shapely==1.6.0
-six==1.13.0
-tqdm==4.7.4
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
index e3c7a332c..c5803387e 100644
--- a/testing/constraints-3.7.txt
+++ b/testing/constraints-3.7.txt
@@ -11,7 +11,7 @@ google-api-core==1.31.5
 google-cloud-bigquery-storage==2.0.0
 google-cloud-core==1.4.1
 google-resumable-media==0.6.0
-grpcio==1.38.1
+grpcio==1.47.0
 ipython==7.0.1
 opentelemetry-api==1.1.0
 opentelemetry-instrumentation==0.20b0
diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt
index 3fd8886e6..e5e73c5c7 100644
--- a/testing/constraints-3.8.txt
+++ b/testing/constraints-3.8.txt
@@ -1 +1,2 @@
+grpcio==1.47.0
 pandas==1.2.0
diff --git a/testing/constraints-3.9.txt b/testing/constraints-3.9.txt
index 39dc6250e..d4c302867 100644
--- a/testing/constraints-3.9.txt
+++ b/testing/constraints-3.9.txt
@@ -4,4 +4,5 @@
 #
 # NOTE: Not comprehensive yet, will eventually be maintained semi-automatically by
 # the renovate bot.
+grpcio==1.47.0
 pyarrow>=4.0.0