diff --git a/api_core/nox.py b/api_core/nox.py index de9726dc2cb1..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.4', '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 479c2f806ea1..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.4', '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 f8bfb4b33c8a..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.4', '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 a27947c54163..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.4', '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 5f978a52cf24..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.4', '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 d2ac8f18b2ab..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.4', '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 1c825175a3bc..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.4', '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 6631ec884d32..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.4', '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 0e25875fbdc4..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.4', '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 e03cc2ac29c6..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.4', '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 0e26db247967..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.4', '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 0a9b26e4753f..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.4', '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 a824c4ec866d..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.4', '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/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..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.4', '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/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 d544f2eef081..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.4', '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 5538d7ba4287..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.4', '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 184411511b62..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.4', '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 bc00c68c3c3f..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.4', '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 4354f9f5d816..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.4', '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 180dfc19fe88..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.4', '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 2aa58029c027..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.4', '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 2874a91796ca..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.4', '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 333316017caf..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.4', '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 3ec93a36f47a..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.4', '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 ae8e1aa53a30..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.4', '3.5', '3.6']) +@nox.parametrize('py', ['2.7', '3.5', '3.6', '3.7']) def unit(session, py): """Run the unit test suite."""