Add Test runs for Python 3.7 and remove 3.4 (#5295)

crwilcox · web-flow · commit 065d34b6497e · 2018-05-04T09:01:24.000-07:00
* remove 3.4 from unit test runs * add 3.7 to most packages. PubSub, Monitoring, BigQuery not enabled * Fix #5292 by draining queue in a way compatible with SimpleQueue and Queue
diff --git a/packages/google-cloud-pubsub/google/cloud/pubsub_v1/subscriber/scheduler.py b/packages/google-cloud-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/packages/google-cloud-pubsub/nox.py b/packages/google-cloud-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."""
 
