From 2cc87ef5f18010c6c9a7ad63496db29453afbf36 Mon Sep 17 00:00:00 2001
From: Chris Wilcox <crwilcox@google.com>
Date: Thu, 3 May 2018 12:26:09 -0700
Subject: [PATCH 1/3] remove 3.4 from unit test runs

---
 api_core/nox.py              | 2 +-
 bigquery_datatransfer/nox.py | 2 +-
 bigtable/nox.py              | 2 +-
 container/nox.py             | 2 +-
 core/nox.py                  | 2 +-
 dataproc/nox.py              | 2 +-
 datastore/nox.py             | 2 +-
 dlp/nox.py                   | 2 +-
 dns/nox.py                   | 2 +-
 error_reporting/nox.py       | 2 +-
 firestore/nox.py             | 2 +-
 language/nox.py              | 2 +-
 logging/nox.py               | 2 +-
 monitoring/nox.py            | 2 +-
 oslogin/nox.py               | 2 +-
 pubsub/nox.py                | 2 +-
 resource_manager/nox.py      | 2 +-
 runtimeconfig/nox.py         | 2 +-
 speech/nox.py                | 2 +-
 storage/nox.py               | 2 +-
 texttospeech/nox.py          | 2 +-
 trace/nox.py                 | 2 +-
 translate/nox.py             | 2 +-
 videointelligence/nox.py     | 2 +-
 vision/nox.py                | 2 +-
 websecurityscanner/nox.py    | 2 +-
 26 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/api_core/nox.py b/api_core/nox.py
index de9726dc2cb1..11f2578dbe54 100644
--- a/api_core/nox.py
+++ b/api_core/nox.py
@@ -52,7 +52,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/bigquery_datatransfer/nox.py b/bigquery_datatransfer/nox.py
index 479c2f806ea1..4b5c1f2bf0a6 100644
--- a/bigquery_datatransfer/nox.py
+++ b/bigquery_datatransfer/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/bigtable/nox.py b/bigtable/nox.py
index f8bfb4b33c8a..09428fca8de9 100644
--- a/bigtable/nox.py
+++ b/bigtable/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/container/nox.py b/container/nox.py
index a27947c54163..5257d8d7bc95 100644
--- a/container/nox.py
+++ b/container/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/core/nox.py b/core/nox.py
index 5f978a52cf24..d889e9908de5 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -58,7 +58,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/dataproc/nox.py b/dataproc/nox.py
index d2ac8f18b2ab..72d4f3df49ee 100644
--- a/dataproc/nox.py
+++ b/dataproc/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/datastore/nox.py b/datastore/nox.py
index 1c825175a3bc..7dca0d1111bc 100644
--- a/datastore/nox.py
+++ b/datastore/nox.py
@@ -54,7 +54,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/dlp/nox.py b/dlp/nox.py
index 6631ec884d32..4dc7a8ef60bb 100644
--- a/dlp/nox.py
+++ b/dlp/nox.py
@@ -50,7 +50,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/dns/nox.py b/dns/nox.py
index 0e25875fbdc4..712d1d246f10 100644
--- a/dns/nox.py
+++ b/dns/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/error_reporting/nox.py b/error_reporting/nox.py
index e03cc2ac29c6..a480c55b935b 100644
--- a/error_reporting/nox.py
+++ b/error_reporting/nox.py
@@ -54,7 +54,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/firestore/nox.py b/firestore/nox.py
index 0e26db247967..7306dc7265de 100644
--- a/firestore/nox.py
+++ b/firestore/nox.py
@@ -56,7 +56,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/language/nox.py b/language/nox.py
index 0a9b26e4753f..07edbfa635fb 100644
--- a/language/nox.py
+++ b/language/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/logging/nox.py b/logging/nox.py
index a824c4ec866d..2f90cc286661 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -72,7 +72,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/monitoring/nox.py b/monitoring/nox.py
index 900f88742595..a22dd18a7a5e 100644
--- a/monitoring/nox.py
+++ b/monitoring/nox.py
@@ -58,7 +58,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/oslogin/nox.py b/oslogin/nox.py
index 180dfc19fe88..304f6db8461c 100644
--- a/oslogin/nox.py
+++ b/oslogin/nox.py
@@ -24,7 +24,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/pubsub/nox.py b/pubsub/nox.py
index d544f2eef081..6a23a3d6572c 100644
--- a/pubsub/nox.py
+++ b/pubsub/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/resource_manager/nox.py b/resource_manager/nox.py
index 5538d7ba4287..83c70d2bb68a 100644
--- a/resource_manager/nox.py
+++ b/resource_manager/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/runtimeconfig/nox.py b/runtimeconfig/nox.py
index 184411511b62..c78855abdb05 100644
--- a/runtimeconfig/nox.py
+++ b/runtimeconfig/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/speech/nox.py b/speech/nox.py
index bc00c68c3c3f..fe0ea9a1ecbd 100644
--- a/speech/nox.py
+++ b/speech/nox.py
@@ -51,7 +51,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/storage/nox.py b/storage/nox.py
index 4354f9f5d816..52f0ced62f17 100644
--- a/storage/nox.py
+++ b/storage/nox.py
@@ -54,7 +54,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/texttospeech/nox.py b/texttospeech/nox.py
index 180dfc19fe88..304f6db8461c 100644
--- a/texttospeech/nox.py
+++ b/texttospeech/nox.py
@@ -24,7 +24,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/trace/nox.py b/trace/nox.py
index 2aa58029c027..12aac7bc91ff 100644
--- a/trace/nox.py
+++ b/trace/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/translate/nox.py b/translate/nox.py
index 2874a91796ca..b6d9257c0a21 100644
--- a/translate/nox.py
+++ b/translate/nox.py
@@ -48,7 +48,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/videointelligence/nox.py b/videointelligence/nox.py
index 333316017caf..c120f77d3c52 100644
--- a/videointelligence/nox.py
+++ b/videointelligence/nox.py
@@ -35,7 +35,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/vision/nox.py b/vision/nox.py
index 3ec93a36f47a..40836cdd8db7 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/websecurityscanner/nox.py b/websecurityscanner/nox.py
index ae8e1aa53a30..102350f40ce5 100644
--- a/websecurityscanner/nox.py
+++ b/websecurityscanner/nox.py
@@ -51,7 +51,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 

From 869df9c79df947a98392f1baf5b034b559232989 Mon Sep 17 00:00:00 2001
From: Chris Wilcox <crwilcox@google.com>
Date: Thu, 3 May 2018 12:45:25 -0700
Subject: [PATCH 2/3] add 3.7 to most packages. PubSub, Monitoring, BigQuery
 not enabled

---
 api_core/nox.py              | 2 +-
 bigquery/nox.py              | 2 +-
 bigquery_datatransfer/nox.py | 2 +-
 bigtable/nox.py              | 2 +-
 container/nox.py             | 2 +-
 core/nox.py                  | 2 +-
 dataproc/nox.py              | 2 +-
 datastore/nox.py             | 2 +-
 dlp/nox.py                   | 2 +-
 dns/nox.py                   | 2 +-
 error_reporting/nox.py       | 2 +-
 firestore/nox.py             | 2 +-
 language/nox.py              | 2 +-
 logging/nox.py               | 2 +-
 oslogin/nox.py               | 2 +-
 resource_manager/nox.py      | 2 +-
 runtimeconfig/nox.py         | 2 +-
 speech/nox.py                | 2 +-
 storage/nox.py               | 2 +-
 texttospeech/nox.py          | 2 +-
 trace/nox.py                 | 2 +-
 translate/nox.py             | 2 +-
 videointelligence/nox.py     | 2 +-
 vision/nox.py                | 2 +-
 websecurityscanner/nox.py    | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/api_core/nox.py b/api_core/nox.py
index 11f2578dbe54..7b40c6821023 100644
--- a/api_core/nox.py
+++ b/api_core/nox.py
@@ -52,7 +52,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/bigquery/nox.py b/bigquery/nox.py
index 29dead9ac43d..bcf20c077f53 100644
--- a/bigquery/nox.py
+++ b/bigquery/nox.py
@@ -65,7 +65,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.4', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/bigquery_datatransfer/nox.py b/bigquery_datatransfer/nox.py
index 4b5c1f2bf0a6..c59f64b19e2f 100644
--- a/bigquery_datatransfer/nox.py
+++ b/bigquery_datatransfer/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/bigtable/nox.py b/bigtable/nox.py
index 09428fca8de9..3b9a2aad12f4 100644
--- a/bigtable/nox.py
+++ b/bigtable/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/container/nox.py b/container/nox.py
index 5257d8d7bc95..2da528928e6c 100644
--- a/container/nox.py
+++ b/container/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/core/nox.py b/core/nox.py
index d889e9908de5..14091489942b 100644
--- a/core/nox.py
+++ b/core/nox.py
@@ -58,7 +58,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/dataproc/nox.py b/dataproc/nox.py
index 72d4f3df49ee..298196b30399 100644
--- a/dataproc/nox.py
+++ b/dataproc/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/datastore/nox.py b/datastore/nox.py
index 7dca0d1111bc..f6a123835a5f 100644
--- a/datastore/nox.py
+++ b/datastore/nox.py
@@ -54,7 +54,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/dlp/nox.py b/dlp/nox.py
index 4dc7a8ef60bb..896c6a2363be 100644
--- a/dlp/nox.py
+++ b/dlp/nox.py
@@ -50,7 +50,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/dns/nox.py b/dns/nox.py
index 712d1d246f10..e51b1af74017 100644
--- a/dns/nox.py
+++ b/dns/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/error_reporting/nox.py b/error_reporting/nox.py
index a480c55b935b..c736b1676673 100644
--- a/error_reporting/nox.py
+++ b/error_reporting/nox.py
@@ -54,7 +54,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/firestore/nox.py b/firestore/nox.py
index 7306dc7265de..d841a999caab 100644
--- a/firestore/nox.py
+++ b/firestore/nox.py
@@ -56,7 +56,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/language/nox.py b/language/nox.py
index 07edbfa635fb..6b070d9c2e5b 100644
--- a/language/nox.py
+++ b/language/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/logging/nox.py b/logging/nox.py
index 2f90cc286661..c02870ba753b 100644
--- a/logging/nox.py
+++ b/logging/nox.py
@@ -72,7 +72,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/oslogin/nox.py b/oslogin/nox.py
index 304f6db8461c..58f8c2b507ce 100644
--- a/oslogin/nox.py
+++ b/oslogin/nox.py
@@ -24,7 +24,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/resource_manager/nox.py b/resource_manager/nox.py
index 83c70d2bb68a..a7d69a3bf92a 100644
--- a/resource_manager/nox.py
+++ b/resource_manager/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/runtimeconfig/nox.py b/runtimeconfig/nox.py
index c78855abdb05..7899d19c51d5 100644
--- a/runtimeconfig/nox.py
+++ b/runtimeconfig/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/speech/nox.py b/speech/nox.py
index fe0ea9a1ecbd..9932ac3e295f 100644
--- a/speech/nox.py
+++ b/speech/nox.py
@@ -51,7 +51,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/storage/nox.py b/storage/nox.py
index 52f0ced62f17..64967185e939 100644
--- a/storage/nox.py
+++ b/storage/nox.py
@@ -54,7 +54,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/texttospeech/nox.py b/texttospeech/nox.py
index 304f6db8461c..58f8c2b507ce 100644
--- a/texttospeech/nox.py
+++ b/texttospeech/nox.py
@@ -24,7 +24,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/trace/nox.py b/trace/nox.py
index 12aac7bc91ff..248b09e7b428 100644
--- a/trace/nox.py
+++ b/trace/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/translate/nox.py b/translate/nox.py
index b6d9257c0a21..c8e3a6e48c0a 100644
--- a/translate/nox.py
+++ b/translate/nox.py
@@ -48,7 +48,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/videointelligence/nox.py b/videointelligence/nox.py
index c120f77d3c52..534cd7705c0a 100644
--- a/videointelligence/nox.py
+++ b/videointelligence/nox.py
@@ -35,7 +35,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/vision/nox.py b/vision/nox.py
index 40836cdd8db7..73434d095b2c 100644
--- a/vision/nox.py
+++ b/vision/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 
diff --git a/websecurityscanner/nox.py b/websecurityscanner/nox.py
index 102350f40ce5..af0b460c33a5 100644
--- a/websecurityscanner/nox.py
+++ b/websecurityscanner/nox.py
@@ -51,7 +51,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""
 

From 8fe5f551af757b642d9ba41442eb5ec671748b13 Mon Sep 17 00:00:00 2001
From: Chris Wilcox <crwilcox@google.com>
Date: Thu, 3 May 2018 17:09:04 -0700
Subject: [PATCH 3/3] Fix #5292 by draining queue in a way compatible with
 SimpleQueue and Queue

---
 pubsub/google/cloud/pubsub_v1/subscriber/scheduler.py | 6 +++++-
 pubsub/nox.py                                         | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pubsub/google/cloud/pubsub_v1/subscriber/scheduler.py b/pubsub/google/cloud/pubsub_v1/subscriber/scheduler.py
index 17e2c2f967ce..70c3721249f9 100644
--- a/pubsub/google/cloud/pubsub_v1/subscriber/scheduler.py
+++ b/pubsub/google/cloud/pubsub_v1/subscriber/scheduler.py
@@ -118,5 +118,9 @@ def shutdown(self):
         # Drop all pending item from the executor. Without this, the executor
         # will block until all pending items are complete, which is
         # undesirable.
-        self._executor._work_queue.queue.clear()
+        try:
+            while True:
+                self._executor._work_queue.get(block=False)
+        except queue.Empty:
+            pass
         self._executor.shutdown()
diff --git a/pubsub/nox.py b/pubsub/nox.py
index 6a23a3d6572c..7deabf7dbfd0 100644
--- a/pubsub/nox.py
+++ b/pubsub/nox.py
@@ -53,7 +53,7 @@ def default(session):
 
 
 @nox.session
-@nox.parametrize('py', ['2.7', '3.5', '3.6'])
+@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7'])
 def unit(session, py):
     """Run the unit test suite."""