remove remaining py3.8 references

abbrowne126 · abbrowne126 · commit d3e7791d9351 · 2026-01-22T15:49:39.000-05:00
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
+        python: ['3.9', '3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
     - name: Checkout
       uses: actions/checkout@v4
diff --git a/.kokoro/samples/python3.8/common.cfg b/.kokoro/samples/python3.8/common.cfg
@@ -10,7 +10,7 @@ action {
 # Specify which tests to run
 env_vars: {
     key: "RUN_TESTS_SESSION"
-    value: "py-3.8"
+    value: "py-3.14"
 }
 
 # Declare build specific Cloud project.
@@ -37,4 +37,4 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/python-docs-samples"
 gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
 
 # Use the trampoline script to run in docker.
-build_file: "python-pubsub/.kokoro/trampoline_v2.sh"
+build_file: "python-pubsub/.kokoro/trampoline_v2.sh"
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -195,11 +195,11 @@ configure them just like the System Tests.
 
    # Run all tests in a folder
    $ cd samples/snippets
-   $ nox -s py-3.8
+   $ nox -s py-3.14
 
    # Run a single sample test
    $ cd samples/snippets
-   $ nox -s py-3.8 -- -k <name of test>
+   $ nox -s py-3.14 -- -k <name of test>
 
 ********************************************
 Note About ``README`` as it pertains to PyPI
diff --git a/pytest.ini b/pytest.ini
@@ -6,8 +6,6 @@ filterwarnings =
     ignore:.*custom tp_new.*in Python 3.14:DeprecationWarning
     # Remove once https://github.com/grpc/grpc/issues/35086 is fixed
     ignore:There is no current event loop:DeprecationWarning:grpc.aio._channel
-    # Remove after support for Python 3.7 is dropped
-    ignore:After January 1, 2024, new releases of this library will drop support for Python 3.7:DeprecationWarning
     # Remove warning once https://github.com/googleapis/gapic-generator-python/issues/1938 is fixed
     ignore:The return_immediately flag is deprecated and should be set to False.:DeprecationWarning
     # Remove warning once https://github.com/googleapis/gapic-generator-python/issues/1939 is fixed
@@ -27,11 +25,6 @@ filterwarnings =
     ignore:You are using a Python version.*which Google will stop supporting in new releases of google\.api_core.*:FutureWarning
     ignore:You are using a non-supported Python version \(([\d\.]+)\)\. Google will not post any further updates to google\.api_core.*:FutureWarning
     ignore:You are using a Python version \(([\d\.]+)\) past its end of life\. Google will update google\.api_core.*:FutureWarning
-    # Remove after support for Python 3.7 is dropped
-    ignore:You are using a non-supported Python version \(3\.7:FutureWarning
-    # Remove after support for Python 3.8 is dropped
-    ignore:You are using a non-supported Python version \(3\.8:DeprecationWarning
-    ignore:You are using a non-supported Python version \(3\.8:FutureWarning
     # Remove after support for Python 3.9 is dropped
     ignore:You are using a Python version \(3\.9:FutureWarning
     # Remove after support for Python 3.10 is dropped
diff --git a/tests/system.py b/tests/system.py
@@ -25,11 +25,7 @@
 import time
 from typing import Any, Callable, cast, TypeVar
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 from flaky import flaky
 import pytest
diff --git a/tests/unit/gapic/pubsub_v1/test_publisher.py b/tests/unit/gapic/pubsub_v1/test_publisher.py
@@ -15,12 +15,8 @@
 #
 import os
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-    from unittest.mock import AsyncMock  # pragma: NO COVER
-except ImportError:  # pragma: NO COVER
-    import mock
+
+import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/pubsub_v1/test_schema_service.py b/tests/unit/gapic/pubsub_v1/test_schema_service.py
@@ -15,12 +15,7 @@
 #
 import os
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-    from unittest.mock import AsyncMock  # pragma: NO COVER
-except ImportError:  # pragma: NO COVER
-    import mock
+import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/gapic/pubsub_v1/test_subscriber.py b/tests/unit/gapic/pubsub_v1/test_subscriber.py
@@ -16,12 +16,7 @@
 import os
 import warnings
 
-# try/except added for compatibility with python < 3.8
-try:
-    from unittest import mock
-    from unittest.mock import AsyncMock  # pragma: NO COVER
-except ImportError:  # pragma: NO COVER
-    import mock
+import mock
 
 import grpc
 from grpc.experimental import aio
diff --git a/tests/unit/pubsub_v1/publisher/batch/test_thread.py b/tests/unit/pubsub_v1/publisher/batch/test_thread.py
@@ -17,11 +17,7 @@
 import threading
 import time
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_ordered_sequencer.py
@@ -15,11 +15,7 @@
 import concurrent.futures as futures
 import sys
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py b/tests/unit/pubsub_v1/publisher/sequencer/test_unordered_sequencer.py
@@ -13,11 +13,7 @@
 # limitations under the License.
 import sys
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -21,11 +21,7 @@
 import grpc
 import math
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 import time
diff --git a/tests/unit/pubsub_v1/subscriber/test_dispatcher.py b/tests/unit/pubsub_v1/subscriber/test_dispatcher.py
@@ -29,11 +29,7 @@
 )
 from google.pubsub_v1.types import PubsubMessage
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 from google.cloud.pubsub_v1.subscriber.exceptions import (
diff --git a/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py b/tests/unit/pubsub_v1/subscriber/test_futures_subscriber.py
@@ -15,11 +15,7 @@
 from __future__ import absolute_import
 import sys
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_heartbeater.py b/tests/unit/pubsub_v1/subscriber/test_heartbeater.py
@@ -19,11 +19,7 @@
 from google.cloud.pubsub_v1.subscriber._protocol import heartbeater
 from google.cloud.pubsub_v1.subscriber._protocol import streaming_pull_manager
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_helper_threads.py b/tests/unit/pubsub_v1/subscriber/test_helper_threads.py
@@ -14,11 +14,7 @@
 
 import sys
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import queue
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_leaser.py b/tests/unit/pubsub_v1/subscriber/test_leaser.py
@@ -27,11 +27,7 @@
 )
 from google.cloud.pubsub_v1.subscriber import message
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_message.py b/tests/unit/pubsub_v1/subscriber/test_message.py
@@ -17,11 +17,7 @@
 import sys
 import time
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 from google.api_core import datetime_helpers
 from google.cloud.pubsub_v1.subscriber import message
diff --git a/tests/unit/pubsub_v1/subscriber/test_scheduler.py b/tests/unit/pubsub_v1/subscriber/test_scheduler.py
@@ -19,11 +19,7 @@
 import threading
 import time
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 from google.cloud.pubsub_v1.subscriber import scheduler
 
diff --git a/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
@@ -32,11 +32,7 @@
 from google.cloud.pubsub_v1.types import PubsubMessage
 
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 import pytest
 
 from google.api_core import bidi
diff --git a/tests/unit/pubsub_v1/subscriber/test_subscribe_opentelemetry.py b/tests/unit/pubsub_v1/subscriber/test_subscribe_opentelemetry.py
@@ -32,11 +32,7 @@
 from google.cloud.pubsub_v1.subscriber.message import Message
 from google.cloud.pubsub_v1.types import PubsubMessage
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 RECEIVED = datetime.datetime(2012, 4, 21, 15, 0, tzinfo=datetime.timezone.utc)
 RECEIVED_SECONDS = datetime_helpers.to_milliseconds(RECEIVED) // 1000
diff --git a/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py b/tests/unit/pubsub_v1/subscriber/test_subscriber_client.py
@@ -16,11 +16,7 @@
 
 import grpc
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
diff --git a/tests/unit/pubsub_v1/test_futures.py b/tests/unit/pubsub_v1/test_futures.py
@@ -17,11 +17,7 @@
 import threading
 import time
 
-# special case python < 3.8
-if sys.version_info.major == 3 and sys.version_info.minor < 8:
-    import mock
-else:
-    from unittest import mock
+from unittest import mock
 
 import pytest
 
