From 54dc8b0179bc229b87bb1df1dd5c9711b6f8452a Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Feb 04 2022 17:20:16 +0000 Subject: Update to 2.11.0 --- diff --git a/.gitignore b/.gitignore index d40e676..d838e0a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /python-kms-2.9.0.tar.gz /python-kms-2.10.0.tar.gz /python-kms-2.10.1.tar.gz +/python-kms-2.11.0.tar.gz diff --git a/python-google-cloud-kms-mock-fix.patch b/python-google-cloud-kms-mock-fix.patch index b087b6e..9e7296c 100644 --- a/python-google-cloud-kms-mock-fix.patch +++ b/python-google-cloud-kms-mock-fix.patch @@ -1,14 +1,28 @@ -From 487c356c88adf19c9d1603ed7b0cf734ab72b6ad Mon Sep 17 00:00:00 2001 +From 2b8ac004d2734f43a7fedc487447ad6ea686cbc7 Mon Sep 17 00:00:00 2001 From: Major Hayden -Date: Tue, 2 Nov 2021 14:15:09 -0500 +Date: Fri, 4 Feb 2022 11:18:13 -0600 Subject: [PATCH] Use unittest.mock --- + tests/unit/gapic/kms_v1/test_ekm_service.py | 2 +- tests/unit/gapic/kms_v1/test_key_management_service.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 2 deletions(-) +diff --git a/tests/unit/gapic/kms_v1/test_ekm_service.py b/tests/unit/gapic/kms_v1/test_ekm_service.py +index 2f00f3a..d84bd8d 100644 +--- a/tests/unit/gapic/kms_v1/test_ekm_service.py ++++ b/tests/unit/gapic/kms_v1/test_ekm_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 diff --git a/tests/unit/gapic/kms_v1/test_key_management_service.py b/tests/unit/gapic/kms_v1/test_key_management_service.py -index d373917..434bc25 100644 +index f05188f..5eef8ec 100644 --- a/tests/unit/gapic/kms_v1/test_key_management_service.py +++ b/tests/unit/gapic/kms_v1/test_key_management_service.py @@ -14,7 +14,7 @@ @@ -21,5 +35,5 @@ index d373917..434bc25 100644 import grpc from grpc.experimental import aio -- -2.33.1 +2.34.1 diff --git a/python-google-cloud-kms.spec b/python-google-cloud-kms.spec index 5b362a6..5a18423 100644 --- a/python-google-cloud-kms.spec +++ b/python-google-cloud-kms.spec @@ -3,7 +3,7 @@ %global srcname google-cloud-kms %global forgeurl https://github.com/googleapis/python-kms -Version: 2.10.1 +Version: 2.11.0 %global tag v%{version} %forgemeta @@ -22,6 +22,10 @@ BuildArch: noarch BuildRequires: python3-devel +# NOTE(mhayden): Upstream dropped a requirement on setuptools, so these two are required. +BuildRequires: pyproject-rpm-macros +BuildRequires: python3-setuptools + %if %{with tests} BuildRequires: python3dist(cryptography) BuildRequires: python3dist(pem) diff --git a/sources b/sources index 25fd02e..f4059ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-kms-2.10.1.tar.gz) = d89e357ab97dcee4e4ecce66c45385b05aabba6170f62d64e86fa68ea4fe588a54daaef6027b547fc8f520eee71307444e95769fc19f1fac8d3fef1684ecb704 +SHA512 (python-kms-2.11.0.tar.gz) = 9b8d81fc76becf7933412d95cfdfeaa63d1c8c404f6ce965f257b1a27cb6b9598fed2c88c7b0837a6a57891ed1fed274dd6ccc682089b005297b372866897a8d