From 143215f135d4a54ca31ecf141dcfc1e4fdd754ed Mon Sep 17 00:00:00 2001
From: Tim Swena <swast@google.com>
Date: Wed, 16 Apr 2025 14:45:29 -0500
Subject: [PATCH] deps: remove test dependency on pytest-mock package

---
 setup.py                               |  1 -
 tests/unit/ml/test_compose.py          | 29 +++++++++++++-------------
 tests/unit/ml/test_golden_sql.py       | 11 +++++-----
 tests/unit/session/test_io_bigquery.py |  9 ++++----
 4 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/setup.py b/setup.py
index a813063992..edc77e11b6 100644
--- a/setup.py
+++ b/setup.py
@@ -77,7 +77,6 @@
     # Packages required for basic development flow.
     "dev": [
         "pytest",
-        "pytest-mock",
         "pre-commit",
         "nox",
         "google-cloud-testutils",
diff --git a/tests/unit/ml/test_compose.py b/tests/unit/ml/test_compose.py
index 450ce8d6ee..86cbb111f4 100644
--- a/tests/unit/ml/test_compose.py
+++ b/tests/unit/ml/test_compose.py
@@ -281,7 +281,7 @@ def test_customtransformer_compile_sql(mock_X):
     ]
 
 
-def create_bq_model_mock(mocker, transform_columns, feature_columns=None):
+def create_bq_model_mock(monkeypatch, transform_columns, feature_columns=None):
     properties = {"transformColumns": transform_columns}
     mock_bq_model = bigquery.Model("model_project.model_dataset.model_id")
     type(mock_bq_model)._properties = mock.PropertyMock(return_value=properties)
@@ -289,18 +289,19 @@ def create_bq_model_mock(mocker, transform_columns, feature_columns=None):
         result = [
             bigquery.standard_sql.StandardSqlField(col, None) for col in feature_columns
         ]
-        mocker.patch(
-            "google.cloud.bigquery.model.Model.feature_columns",
-            new_callable=mock.PropertyMock(return_value=result),
+        monkeypatch.setattr(
+            type(mock_bq_model),
+            "feature_columns",
+            mock.PropertyMock(return_value=result),
         )
 
     return mock_bq_model
 
 
 @pytest.fixture
-def bq_model_good(mocker):
+def bq_model_good(monkeypatch):
     return create_bq_model_mock(
-        mocker,
+        monkeypatch,
         [
             {
                 "name": "ident_culmen_length_mm",
@@ -337,9 +338,9 @@ def bq_model_good(mocker):
 
 
 @pytest.fixture
-def bq_model_merge(mocker):
+def bq_model_merge(monkeypatch):
     return create_bq_model_mock(
-        mocker,
+        monkeypatch,
         [
             {
                 "name": "labelencoded_county",
@@ -357,9 +358,9 @@ def bq_model_merge(mocker):
 
 
 @pytest.fixture
-def bq_model_no_merge(mocker):
+def bq_model_no_merge(monkeypatch):
     return create_bq_model_mock(
-        mocker,
+        monkeypatch,
         [
             {
                 "name": "ident_culmen_length_mm",
@@ -372,9 +373,9 @@ def bq_model_no_merge(mocker):
 
 
 @pytest.fixture
-def bq_model_unknown_ML(mocker):
+def bq_model_unknown_ML(monkeypatch):
     return create_bq_model_mock(
-        mocker,
+        monkeypatch,
         [
             {
                 "name": "unknownml_culmen_length_mm",
@@ -391,9 +392,9 @@ def bq_model_unknown_ML(mocker):
 
 
 @pytest.fixture
-def bq_model_flexnames(mocker):
+def bq_model_flexnames(monkeypatch):
     return create_bq_model_mock(
-        mocker,
+        monkeypatch,
         [
             {
                 "name": "Flex Name culmen_length_mm",
diff --git a/tests/unit/ml/test_golden_sql.py b/tests/unit/ml/test_golden_sql.py
index 03695a20e4..62cfe09704 100644
--- a/tests/unit/ml/test_golden_sql.py
+++ b/tests/unit/ml/test_golden_sql.py
@@ -17,10 +17,10 @@
 from google.cloud import bigquery
 import pandas as pd
 import pytest
-import pytest_mock
 
 import bigframes
 from bigframes.ml import core, decomposition, linear_model
+import bigframes.ml.core
 import bigframes.pandas as bpd
 
 TEMP_MODEL_ID = bigquery.ModelReference.from_string(
@@ -50,10 +50,11 @@ def mock_session():
 
 
 @pytest.fixture
-def bqml_model_factory(mocker: pytest_mock.MockerFixture):
-    mocker.patch(
-        "bigframes.ml.core.BqmlModelFactory._create_model_ref",
-        return_value=TEMP_MODEL_ID,
+def bqml_model_factory(monkeypatch):
+    monkeypatch.setattr(
+        bigframes.ml.core.BqmlModelFactory,
+        "_create_model_ref",
+        mock.Mock(return_value=TEMP_MODEL_ID),
     )
     bqml_model_factory = core.BqmlModelFactory()
 
diff --git a/tests/unit/session/test_io_bigquery.py b/tests/unit/session/test_io_bigquery.py
index fa05fffcb2..cdc4991458 100644
--- a/tests/unit/session/test_io_bigquery.py
+++ b/tests/unit/session/test_io_bigquery.py
@@ -15,6 +15,7 @@
 import datetime
 import re
 from typing import Iterable
+from unittest import mock
 
 import google.cloud.bigquery as bigquery
 import pytest
@@ -27,10 +28,10 @@
 
 
 @pytest.fixture(scope="function")
-def mock_bq_client(mocker):
-    mock_client = mocker.Mock(spec=bigquery.Client)
-    mock_query_job = mocker.Mock(spec=bigquery.QueryJob)
-    mock_row_iterator = mocker.Mock(spec=bigquery.table.RowIterator)
+def mock_bq_client():
+    mock_client = mock.create_autospec(bigquery.Client)
+    mock_query_job = mock.create_autospec(bigquery.QueryJob)
+    mock_row_iterator = mock.create_autospec(bigquery.table.RowIterator)
 
     mock_query_job.result.return_value = mock_row_iterator