fix: drop python 3.7 (#402)

parthea · web-flow · commit 261b48d9a866 · 2023-02-15T11:07:54.000-05:00
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.7', '3.8', '3.9', '3.10']
+        python: ['3.8', '3.9', '3.10']
     steps:
     - name: Checkout
       uses: actions/checkout@v3
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -22,7 +22,7 @@ In order to add a feature:
   documentation.
 
 - The feature must work fully on the following CPython versions:
-  3.7, 3.8, 3.9 and 3.10 on both UNIX and Windows.
+  3.8, 3.9 and 3.10 on both UNIX and Windows.
 
 - The feature must not add unnecessary dependencies (where
   "unnecessary" is of course subjective, but new dependencies should
@@ -221,12 +221,10 @@ Supported Python Versions
 
 We support:
 
--  `Python 3.7`_
 -  `Python 3.8`_
 -  `Python 3.9`_
 -  `Python 3.10`_
 
-.. _Python 3.7: https://docs.python.org/3.7/
 .. _Python 3.8: https://docs.python.org/3.8/
 .. _Python 3.9: https://docs.python.org/3.9/
 .. _Python 3.10: https://docs.python.org/3.10/
@@ -237,7 +235,7 @@ Supported versions can be found in our ``noxfile.py`` `config`_.
 .. _config: https://github.com/googleapis/python-pubsublite/blob/main/noxfile.py
 
 
-We also explicitly decided to support Python 3 beginning with version 3.7.
+We also explicitly decided to support Python 3 beginning with version 3.8.
 Reasons for this include:
 
 -  Encouraging use of newest versions of Python 3
diff --git a/README.rst b/README.rst
@@ -69,16 +69,16 @@ Code samples and snippets live in the `samples/` folder.
 Supported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 Our client libraries are compatible with all current `active`_ and `maintenance`_ versions of
-Python.
+Python, excluding python 3.7.
 
-Python >= 3.7
+Python >= 3.8
 
 .. _active: https://devguide.python.org/devcycle/#in-development-main-branch
 .. _maintenance: https://devguide.python.org/devcycle/#maintenance-branches
 
 Unsupported Python Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Python <= 3.6
+Python <= 3.7
 
 If you are using an `end-of-life`_
 version of Python, we recommend that you update as soon as possible to an actively supported version.
diff --git a/google/cloud/pubsublite/testing/test_reset_signal.py b/google/cloud/pubsublite/testing/test_reset_signal.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from asynctest.mock import MagicMock
+from unittest.mock import MagicMock
 from google.api_core.exceptions import Aborted, GoogleAPICallError
 from google.protobuf.any_pb2 import Any  # pytype: disable=pyi-error
 from google.rpc.error_details_pb2 import ErrorInfo
diff --git a/google/cloud/pubsublite/testing/test_utils.py b/google/cloud/pubsublite/testing/test_utils.py
@@ -16,7 +16,7 @@
 import threading
 from typing import List, Union, Any, TypeVar, Generic, Optional, Callable, Awaitable
 
-from asynctest import CoroutineMock
+from unittest.mock import AsyncMock
 
 T = TypeVar("T")
 
@@ -55,7 +55,7 @@ def __init__(self):
         self.results = asyncio.Queue()
 
 
-def wire_queues(mock: CoroutineMock) -> QueuePair:
+def wire_queues(mock: AsyncMock) -> QueuePair:
     queues = QueuePair()
     mock.side_effect = make_queue_waiter(queues.called, queues.results)
     return queues
diff --git a/noxfile.py b/noxfile.py
@@ -32,17 +32,15 @@
 
 DEFAULT_PYTHON_VERSION = "3.8"
 
-UNIT_TEST_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
+UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10"]
 UNIT_TEST_STANDARD_DEPENDENCIES = [
     "mock",
     "asyncmock",
     "pytest",
     "pytest-cov",
     "pytest-asyncio",
 ]
-UNIT_TEST_EXTERNAL_DEPENDENCIES = [
-    "asynctest",
-]
+UNIT_TEST_EXTERNAL_DEPENDENCIES = []
 UNIT_TEST_LOCAL_DEPENDENCIES = []
 UNIT_TEST_DEPENDENCIES = []
 UNIT_TEST_EXTRAS = []
@@ -54,9 +52,7 @@
     "pytest",
     "google-cloud-testutils",
 ]
-SYSTEM_TEST_EXTERNAL_DEPENDENCIES = [
-    "asynctest",
-]
+SYSTEM_TEST_EXTERNAL_DEPENDENCIES = []
 SYSTEM_TEST_LOCAL_DEPENDENCIES = []
 SYSTEM_TEST_DEPENDENCIES = []
 SYSTEM_TEST_EXTRAS = []
diff --git a/owlbot.py b/owlbot.py
@@ -61,9 +61,7 @@
 templated_files = gcp.CommonTemplates().py_library(
     cov_level=96,
     microgenerator=True,
-    unit_test_python_versions=["3.7", "3.8", "3.9", "3.10"],
-    system_test_external_dependencies=["asynctest"],
-    unit_test_external_dependencies=["asynctest"],
+    unit_test_python_versions=["3.8", "3.9", "3.10"],
     versions=gcp.common.detect_versions(path="./google", default_first=True),
 )
 s.move(
@@ -73,6 +71,7 @@
         ".github/release-please.yml",
         "docs/multiprocessing.rst",
         "docs/index.rst",
+        "README.rst",
     ],
 )
 
diff --git a/setup.py b/setup.py
@@ -75,7 +75,6 @@
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
@@ -84,7 +83,7 @@
     ],
     platforms="Posix; MacOS X; Windows",
     packages=packages,
-    python_requires=">=3.7",
+    python_requires=">=3.8",
     namespace_packages=namespaces,
     install_requires=dependencies,
     include_package_data=True,
diff --git a/testing/constraints-3.7.txt b/testing/constraints-3.7.txt
diff --git a/testing/constraints-3.8.txt b/testing/constraints-3.8.txt
@@ -1,6 +1,11 @@
-# -*- coding: utf-8 -*-
-# This constraints file is required for unit tests.
+# This constraints file is used to check that lower bounds
+# are correct in setup.py
 # List all library dependencies and extras in this file.
-google-api-core
-proto-plus
-protobuf
+# Pin the version to the lower bound.
+# e.g., if setup.py has "google-cloud-foo >= 1.14.0, < 2.0.0dev",
+# Then this file should have google-cloud-foo==1.14.0
+google-cloud-pubsub==2.10.0
+grpcio==1.38.1
+grpcio-status==1.38.1
+overrides==6.0.1
+google-api-core==1.33.2
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/ack_set_tracker_impl_test.py b/tests/unit/pubsublite/cloudpubsub/internal/ack_set_tracker_impl_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from asynctest.mock import MagicMock, call
+from unittest.mock import MagicMock, call
 import pytest
 
 from google.api_core.exceptions import FailedPrecondition
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/assigning_subscriber_test.py b/tests/unit/pubsublite/cloudpubsub/internal/assigning_subscriber_test.py
@@ -15,7 +15,7 @@
 from typing import Set
 
 from asyncio import Future
-from asynctest.mock import MagicMock, call
+from unittest.mock import MagicMock, call
 import threading
 import pytest
 from google.api_core.exceptions import FailedPrecondition
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/async_client_multiplexer_test.py b/tests/unit/pubsublite/cloudpubsub/internal/async_client_multiplexer_test.py
@@ -14,7 +14,7 @@
 
 import pytest
 
-from asynctest.mock import call, CoroutineMock
+from unittest.mock import AsyncMock, call
 
 from google.cloud.pubsublite.cloudpubsub.internal.client_multiplexer import (
     AsyncClientMultiplexer,
@@ -30,12 +30,12 @@ class Client:
 
 @pytest.fixture()
 def client_factory():
-    return CoroutineMock()
+    return AsyncMock()
 
 
 @pytest.fixture()
 def client_closer():
-    return CoroutineMock()
+    return AsyncMock()
 
 
 @pytest.fixture()
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/multiplexed_async_subscriber_client_test.py b/tests/unit/pubsublite/cloudpubsub/internal/multiplexed_async_subscriber_client_test.py
@@ -16,7 +16,7 @@
 
 import pytest
 
-from asynctest.mock import call, MagicMock
+from unittest.mock import call, MagicMock
 
 from google.api_core.exceptions import FailedPrecondition
 from google.cloud.pubsub_v1.subscriber.message import Message
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/multiplexed_publisher_client_test.py b/tests/unit/pubsublite/cloudpubsub/internal/multiplexed_publisher_client_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from asynctest.mock import MagicMock
+from unittest.mock import MagicMock
 import pytest
 
 from google.cloud.pubsublite.cloudpubsub.internal.multiplexed_publisher_client import (
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/publisher_impl_test.py b/tests/unit/pubsublite/cloudpubsub/internal/publisher_impl_test.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from asynctest.mock import MagicMock
+from unittest.mock import MagicMock
 import pytest
 
 from google.cloud.pubsublite.cloudpubsub.internal.publisher_impl import (
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py b/tests/unit/pubsublite/cloudpubsub/internal/single_partition_subscriber_test.py
@@ -15,7 +15,7 @@
 import asyncio
 from typing import Callable, List
 
-from asynctest.mock import MagicMock, call
+from unittest.mock import MagicMock, call
 import pytest
 from google.api_core.exceptions import FailedPrecondition
 from google.cloud.pubsub_v1.subscriber.message import Message
diff --git a/tests/unit/pubsublite/cloudpubsub/internal/subscriber_impl_test.py b/tests/unit/pubsublite/cloudpubsub/internal/subscriber_impl_test.py
@@ -18,7 +18,9 @@
 from queue import Queue
 from typing import List
 
-from asynctest.mock import MagicMock
+from unittest.mock import MagicMock
+
+
 import pytest
 from google.api_core.exceptions import FailedPrecondition
 from google.cloud.pubsub_v1.subscriber.message import Message
diff --git a/tests/unit/pubsublite/internal/wire/assigner_impl_test.py b/tests/unit/pubsublite/internal/wire/assigner_impl_test.py
@@ -13,11 +13,10 @@
 # limitations under the License.
 
 import asyncio
-from unittest.mock import call
+from unittest.mock import AsyncMock, call, MagicMock
 from collections import defaultdict
 from typing import Dict, Set
 
-from asynctest.mock import MagicMock, CoroutineMock
 import pytest
 
 from google.cloud.pubsublite.internal.wire.assigner import Assigner
@@ -80,16 +79,16 @@ def sleep_queues() -> Dict[float, QueuePair]:
 @pytest.fixture
 def asyncio_sleep(monkeypatch, sleep_queues):
     """Requests.get() mocked to return {'mock_key':'mock_response'}."""
-    mock = CoroutineMock()
-    monkeypatch.setattr(asyncio, "sleep", mock)
+    mock_sleep = AsyncMock()
+    monkeypatch.setattr(asyncio, "sleep", mock_sleep)
 
     async def sleeper(delay: float):
         await make_queue_waiter(
             sleep_queues[delay].called, sleep_queues[delay].results
         )(delay)
 
-    mock.side_effect = sleeper
-    return mock
+    mock_sleep.side_effect = sleeper
+    return mock_sleep
 
 
 @pytest.fixture()
diff --git a/tests/unit/pubsublite/internal/wire/committer_impl_test.py b/tests/unit/pubsublite/internal/wire/committer_impl_test.py
@@ -17,7 +17,7 @@
 from collections import defaultdict
 from typing import Dict
 
-from asynctest.mock import MagicMock, CoroutineMock
+from unittest.mock import AsyncMock, MagicMock
 import pytest
 
 from google.cloud.pubsublite.internal.wire.committer import Committer
@@ -80,16 +80,16 @@ def sleep_queues() -> Dict[float, QueuePair]:
 @pytest.fixture
 def asyncio_sleep(monkeypatch, sleep_queues):
     """Requests.get() mocked to return {'mock_key':'mock_response'}."""
-    mock = CoroutineMock()
-    monkeypatch.setattr(asyncio, "sleep", mock)
+    mock_sleep = AsyncMock()
+    monkeypatch.setattr(asyncio, "sleep", mock_sleep)
 
     async def sleeper(delay: float):
         await make_queue_waiter(
             sleep_queues[delay].called, sleep_queues[delay].results
         )(delay)
 
-    mock.side_effect = sleeper
-    return mock
+    mock_sleep.side_effect = sleeper
+    return mock_sleep
 
 
 @pytest.fixture()
diff --git a/tests/unit/pubsublite/internal/wire/partition_count_watcher_impl_test.py b/tests/unit/pubsublite/internal/wire/partition_count_watcher_impl_test.py
@@ -13,7 +13,7 @@
 # limitations under the License.
 import asyncio
 import queue
-from asynctest.mock import MagicMock
+from unittest.mock import MagicMock
 import pytest
 
 from google.cloud.pubsublite import AdminClientInterface
diff --git a/tests/unit/pubsublite/internal/wire/partition_count_watching_publisher_test.py b/tests/unit/pubsublite/internal/wire/partition_count_watching_publisher_test.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from asynctest.mock import MagicMock
+from unittest.mock import MagicMock
 import pytest
 
 from google.cloud.pubsublite.internal.wire.partition_count_watcher import (
diff --git a/tests/unit/pubsublite/internal/wire/retrying_connection_test.py b/tests/unit/pubsublite/internal/wire/retrying_connection_test.py
@@ -13,9 +13,8 @@
 # limitations under the License.
 
 import asyncio
-from unittest.mock import call
+from unittest.mock import AsyncMock, call, MagicMock
 
-from asynctest.mock import MagicMock, CoroutineMock
 import pytest
 from google.api_core.exceptions import InternalServerError, InvalidArgument, Unknown
 from google.cloud.pubsublite.internal.wire.connection import (
@@ -62,9 +61,9 @@ def retrying_connection(connection_factory, reinitializer):
 @pytest.fixture
 def asyncio_sleep(monkeypatch):
     """Requests.get() mocked to return {'mock_key':'mock_response'}."""
-    mock = CoroutineMock()
-    monkeypatch.setattr(asyncio, "sleep", mock)
-    return mock
+    mock_sleep = AsyncMock()
+    monkeypatch.setattr(asyncio, "sleep", mock_sleep)
+    return mock_sleep
 
 
 async def test_permanent_error_on_reinitializer(
diff --git a/tests/unit/pubsublite/internal/wire/single_partition_publisher_test.py b/tests/unit/pubsublite/internal/wire/single_partition_publisher_test.py
diff --git a/tests/unit/pubsublite/internal/wire/subscriber_impl_test.py b/tests/unit/pubsublite/internal/wire/subscriber_impl_test.py
