diff --git a/.gitignore b/.gitignore index 2cceb77..44e7540 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /python-dms-1.3.0.tar.gz /python-dms-1.3.1.tar.gz +/python-dms-1.3.2.tar.gz diff --git a/python-google-cloud-dms-mock.patch b/python-google-cloud-dms-mock.patch deleted file mode 100644 index 82f599b..0000000 --- a/python-google-cloud-dms-mock.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ebd987dbc003b74595cb13b54bded6db79beca71 Mon Sep 17 00:00:00 2001 -From: Major Hayden -Date: Mon, 13 Dec 2021 13:49:07 -0600 -Subject: [PATCH] Use unittest.mock - ---- - tests/unit/gapic/clouddms_v1/test_data_migration_service.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/unit/gapic/clouddms_v1/test_data_migration_service.py b/tests/unit/gapic/clouddms_v1/test_data_migration_service.py -index 9291ff1..a00c216 100644 ---- a/tests/unit/gapic/clouddms_v1/test_data_migration_service.py -+++ b/tests/unit/gapic/clouddms_v1/test_data_migration_service.py -@@ -14,7 +14,7 @@ - # limitations under the License. - # - import os --import mock -+from unittest import mock - - import grpc - from grpc.experimental import aio --- -2.33.1 - diff --git a/python-google-cloud-dms.spec b/python-google-cloud-dms.spec index 6718be3..ade53db 100644 --- a/python-google-cloud-dms.spec +++ b/python-google-cloud-dms.spec @@ -1,9 +1,11 @@ +# F35: Do not update past 1.3.1. F35's protobuf is too old. + # tests are enabled by default %bcond_without tests %global srcname google-cloud-dms %global forgeurl https://github.com/googleapis/python-dms -Version: 1.3.1 +Version: 1.3.2 %global tag v%{version} %forgemeta @@ -14,13 +16,6 @@ Summary: Python SDK for Google Cloud Database Migration Service License: ASL 2.0 URL: %forgeurl Source0: %forgesource -# Use unittest.mock instead of PyPI mock -# (https://fedoraproject.org/wiki/Changes/DeprecatePythonMock). -# -# This simple patch cannot be submitted upstream because they support -# Python 3.6 and 3.7, but use AsyncMock, which was introduced to -# unittest.mock in Python 3.8. -Patch0: python-google-cloud-dms-mock.patch BuildArch: noarch @@ -46,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 3986fcf..e6ed66c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-dms-1.3.1.tar.gz) = 9df9bae4a6c2b1448971c76668d10732cc92bea19efad1b7f35894e90d0199e20ed5389a8a460b19f6f5720a1dd769a1bc219f79f33819df4b5f4f3b1c243033 +SHA512 (python-dms-1.3.2.tar.gz) = c237dbba1c413da22c46d4be45ed3cea188bc26c599dbb23d414096650c10c546f477493ee3479ad13906efffa0a99df2e2df7dbcb5980834e2d6145ffe03301