From 744d0257788571c0b25890763605aeca051fbf09 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Jun 13 2022 19:41:00 +0000
Subject: Update to 3.14.1


---

diff --git a/.gitignore b/.gitignore
index 7c5fe99..54bb1f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /python-spanner-3.12.1.tar.gz
 /python-spanner-3.13.0.tar.gz
 /python-spanner-3.14.0.tar.gz
+/python-spanner-3.14.1.tar.gz
diff --git a/python-google-cloud-spanner-mock.patch b/python-google-cloud-spanner-mock.patch
deleted file mode 100644
index 9583964..0000000
--- a/python-google-cloud-spanner-mock.patch
+++ /dev/null
@@ -1,260 +0,0 @@
-From 30630b74ae689ac1f4db0f06bfb481c1780bfbcd Mon Sep 17 00:00:00 2001
-From: Major Hayden <major@redhat.com>
-Date: Wed, 20 Apr 2022 07:14:55 -0500
-Subject: [PATCH] Use unittest.mock
-
-Signed-off-by: Major Hayden <major@mhtx.net>
----
- tests/_helpers.py                                               | 2 +-
- .../unit/gapic/spanner_admin_database_v1/test_database_admin.py | 2 +-
- .../unit/gapic/spanner_admin_instance_v1/test_instance_admin.py | 2 +-
- tests/unit/gapic/spanner_v1/test_spanner.py                     | 2 +-
- tests/unit/spanner_dbapi/test__helpers.py                       | 2 +-
- tests/unit/spanner_dbapi/test_connection.py                     | 2 +-
- tests/unit/spanner_dbapi/test_cursor.py                         | 2 +-
- tests/unit/test__opentelemetry_tracing.py                       | 2 +-
- tests/unit/test_backup.py                                       | 2 +-
- tests/unit/test_client.py                                       | 2 +-
- tests/unit/test_database.py                                     | 2 +-
- tests/unit/test_instance.py                                     | 2 +-
- tests/unit/test_pool.py                                         | 2 +-
- tests/unit/test_session.py                                      | 2 +-
- tests/unit/test_snapshot.py                                     | 2 +-
- tests/unit/test_streamed.py                                     | 2 +-
- tests/unit/test_table.py                                        | 2 +-
- tests/unit/test_transaction.py                                  | 2 +-
- 18 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/tests/_helpers.py b/tests/_helpers.py
-index 42178fd..ec27cbb 100644
---- a/tests/_helpers.py
-+++ b/tests/_helpers.py
-@@ -1,5 +1,5 @@
- import unittest
--import mock
-+from unittest import mock
- 
- try:
-     from opentelemetry import trace
-diff --git a/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py b/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
-index bf1a442..4a27a7f 100644
---- a/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
-+++ b/tests/unit/gapic/spanner_admin_database_v1/test_database_admin.py
-@@ -14,7 +14,7 @@
- # limitations under the License.
- #
- import os
--import mock
-+from unittest import mock
- 
- import grpc
- from grpc.experimental import aio
-diff --git a/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py b/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
-index 59e7134..76e0f5b 100644
---- a/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
-+++ b/tests/unit/gapic/spanner_admin_instance_v1/test_instance_admin.py
-@@ -14,7 +14,7 @@
- # limitations under the License.
- #
- import os
--import mock
-+from unittest import mock
- 
- import grpc
- from grpc.experimental import aio
-diff --git a/tests/unit/gapic/spanner_v1/test_spanner.py b/tests/unit/gapic/spanner_v1/test_spanner.py
-index d4df289..17c737b 100644
---- a/tests/unit/gapic/spanner_v1/test_spanner.py
-+++ b/tests/unit/gapic/spanner_v1/test_spanner.py
-@@ -14,7 +14,7 @@
- # limitations under the License.
- #
- import os
--import mock
-+from unittest import mock
- 
- import grpc
- from grpc.experimental import aio
-diff --git a/tests/unit/spanner_dbapi/test__helpers.py b/tests/unit/spanner_dbapi/test__helpers.py
-index 84d6b3e..1d23dae 100644
---- a/tests/unit/spanner_dbapi/test__helpers.py
-+++ b/tests/unit/spanner_dbapi/test__helpers.py
-@@ -14,7 +14,7 @@
- 
- """Cloud Spanner DB-API Connection class unit tests."""
- 
--import mock
-+from unittest import mock
- import unittest
- 
- 
-diff --git a/tests/unit/spanner_dbapi/test_connection.py b/tests/unit/spanner_dbapi/test_connection.py
-index 7902de6..5815e55 100644
---- a/tests/unit/spanner_dbapi/test_connection.py
-+++ b/tests/unit/spanner_dbapi/test_connection.py
-@@ -15,7 +15,7 @@
- """Cloud Spanner DB-API Connection class unit tests."""
- 
- import datetime
--import mock
-+from unittest import mock
- import unittest
- import warnings
- 
-diff --git a/tests/unit/spanner_dbapi/test_cursor.py b/tests/unit/spanner_dbapi/test_cursor.py
-index 71e4a96..979a022 100644
---- a/tests/unit/spanner_dbapi/test_cursor.py
-+++ b/tests/unit/spanner_dbapi/test_cursor.py
-@@ -14,7 +14,7 @@
- 
- """Cursor() class unit tests."""
- 
--import mock
-+from unittest import mock
- import sys
- import unittest
- 
-diff --git a/tests/unit/test__opentelemetry_tracing.py b/tests/unit/test__opentelemetry_tracing.py
-index 2587022..1d2dda3 100644
---- a/tests/unit/test__opentelemetry_tracing.py
-+++ b/tests/unit/test__opentelemetry_tracing.py
-@@ -1,5 +1,5 @@
- import importlib
--import mock
-+from unittest import mock
- import unittest
- import sys
- 
-diff --git a/tests/unit/test_backup.py b/tests/unit/test_backup.py
-index 00621c2..8c61476 100644
---- a/tests/unit/test_backup.py
-+++ b/tests/unit/test_backup.py
-@@ -15,7 +15,7 @@
- 
- import unittest
- 
--import mock
-+from unittest import mock
- 
- 
- class _BaseTest(unittest.TestCase):
-diff --git a/tests/unit/test_client.py b/tests/unit/test_client.py
-index 68d8ea6..e778136 100644
---- a/tests/unit/test_client.py
-+++ b/tests/unit/test_client.py
-@@ -14,7 +14,7 @@
- 
- import unittest
- 
--import mock
-+from unittest import mock
- 
- 
- def _make_credentials():
-diff --git a/tests/unit/test_database.py b/tests/unit/test_database.py
-index bd47a2a..bf84c97 100644
---- a/tests/unit/test_database.py
-+++ b/tests/unit/test_database.py
-@@ -15,7 +15,7 @@
- 
- import unittest
- 
--import mock
-+from unittest import mock
- from google.api_core import gapic_v1
- from google.cloud.spanner_v1.param_types import INT64
- from google.api_core.retry import Retry
-diff --git a/tests/unit/test_instance.py b/tests/unit/test_instance.py
-index c715fb2..392707a 100644
---- a/tests/unit/test_instance.py
-+++ b/tests/unit/test_instance.py
-@@ -14,7 +14,7 @@
- 
- import unittest
- 
--import mock
-+from unittest import mock
- 
- 
- class TestInstance(unittest.TestCase):
-diff --git a/tests/unit/test_pool.py b/tests/unit/test_pool.py
-index 5934201..bf0bd59 100644
---- a/tests/unit/test_pool.py
-+++ b/tests/unit/test_pool.py
-@@ -16,7 +16,7 @@
- from functools import total_ordering
- import unittest
- 
--import mock
-+from unittest import mock
- 
- 
- def _make_database(name="name"):
-diff --git a/tests/unit/test_session.py b/tests/unit/test_session.py
-index 0f29765..e023d58 100644
---- a/tests/unit/test_session.py
-+++ b/tests/unit/test_session.py
-@@ -15,7 +15,7 @@
- 
- import google.api_core.gapic_v1.method
- from google.cloud.spanner_v1 import RequestOptions
--import mock
-+from unittest import mock
- from tests._helpers import (
-     OpenTelemetryBase,
-     StatusCode,
-diff --git a/tests/unit/test_snapshot.py b/tests/unit/test_snapshot.py
-index 5b515f1..06430fc 100644
---- a/tests/unit/test_snapshot.py
-+++ b/tests/unit/test_snapshot.py
-@@ -14,7 +14,7 @@
- 
- 
- from google.api_core import gapic_v1
--import mock
-+from unittest import mock
- 
- from google.cloud.spanner_v1 import RequestOptions
- from tests._helpers import (
-diff --git a/tests/unit/test_streamed.py b/tests/unit/test_streamed.py
-index 2714ddf..aef6d65 100644
---- a/tests/unit/test_streamed.py
-+++ b/tests/unit/test_streamed.py
-@@ -15,7 +15,7 @@
- 
- import unittest
- 
--import mock
-+from unittest import mock
- 
- 
- class TestStreamedResultSet(unittest.TestCase):
-diff --git a/tests/unit/test_table.py b/tests/unit/test_table.py
-index 0a49a9b..245fa06 100644
---- a/tests/unit/test_table.py
-+++ b/tests/unit/test_table.py
-@@ -15,7 +15,7 @@
- import unittest
- 
- from google.cloud.exceptions import NotFound
--import mock
-+from unittest import mock
- 
- from google.cloud.spanner_v1.types import (
-     StructType,
-diff --git a/tests/unit/test_transaction.py b/tests/unit/test_transaction.py
-index d4d9c99..7e720a8 100644
---- a/tests/unit/test_transaction.py
-+++ b/tests/unit/test_transaction.py
-@@ -13,7 +13,7 @@
- # limitations under the License.
- 
- 
--import mock
-+from unittest import mock
- 
- from google.cloud.spanner_v1 import RequestOptions
- from google.cloud.spanner_v1 import Type
--- 
-2.36.0
-
diff --git a/python-google-cloud-spanner.spec b/python-google-cloud-spanner.spec
index 605b6f4..f9be9d9 100644
--- a/python-google-cloud-spanner.spec
+++ b/python-google-cloud-spanner.spec
@@ -1,9 +1,11 @@
+# F35: Do not update past 3.14.0. F35's protobuf is too old.
+
 # tests are enabled by default
-%bcond_without tests
+%bcond_without  tests
 
 %global         srcname     google-cloud-spanner
 %global         forgeurl    https://github.com/googleapis/python-spanner
-Version:        3.14.0
+Version:        3.14.1
 %global         tag         v%{version}
 %forgemeta
 
@@ -14,7 +16,6 @@ Summary:        Python Client for Google Cloud Spanner
 License:        ASL 2.0
 URL:            %forgeurl
 Source0:        %forgesource
-Patch0:         python-google-cloud-spanner-mock.patch
 
 BuildArch:      noarch
 
@@ -40,6 +41,10 @@ Summary:        %{summary}
 %prep
 %forgeautosetup -p1
 
+# Replace mock imports with unittest.mock.
+grep -rl "^[[:space:]]*import mock" tests | \
+    xargs sed -i -E 's/^([[:space:]]*)import mock/\1from unittest import mock/'
+
 
 %generate_buildrequires
 %pyproject_buildrequires -r
diff --git a/sources b/sources
index 79b73d5..095e3c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (python-spanner-3.14.0.tar.gz) = 77ae5c8ae616bc3a4107c9139eb0ea4c7fe7ce8d7dda206c7f4cca42bdd3d255921415a751d942c3a330ce22b7a8c532d22b03eca3718132720f20fb405779e8
+SHA512 (python-spanner-3.14.1.tar.gz) = 3aef521bd57dd7958c71498738aa2c71f83457b77a4ef16e7852351bca4cb7a6fb4010d686684250b95af2ebbb965f8ac58a4d41c0997d0b7305361a9ff3b8c7