From f69aab54452431af4c63880629e2483094b427dd724c4b827120ab7775b547c7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 8 Jun 2022 12:37:38 +0000 Subject: [PATCH] Accepting request 981297 from home:pgajdos:python - do not require python-mock for build - added patches fix https://github.com/googleapis/google-auth-library-python-httplib2/issues/68 + python-google-auth-httplib2-no-mock.patch OBS-URL: https://build.opensuse.org/request/show/981297 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-auth-httplib2?expand=0&rev=6 --- python-google-auth-httplib2-no-mock.patch | 12 ++++++++++++ python-google-auth-httplib2.changes | 8 ++++++++ python-google-auth-httplib2.spec | 6 ++++-- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 python-google-auth-httplib2-no-mock.patch diff --git a/python-google-auth-httplib2-no-mock.patch b/python-google-auth-httplib2-no-mock.patch new file mode 100644 index 0000000..04cf402 --- /dev/null +++ b/python-google-auth-httplib2-no-mock.patch @@ -0,0 +1,12 @@ +diff -upr google-auth-httplib2-0.1.0.orig/tests/test_google_auth_httplib2.py google-auth-httplib2-0.1.0/tests/test_google_auth_httplib2.py +--- google-auth-httplib2-0.1.0.orig/tests/test_google_auth_httplib2.py 2022-06-08 13:33:16.841483803 +0200 ++++ google-auth-httplib2-0.1.0/tests/test_google_auth_httplib2.py 2022-06-08 13:33:16.845483827 +0200 +@@ -13,7 +13,7 @@ + # limitations under the License. + + import httplib2 +-import mock ++from unittest import mock + import six + from six.moves import http_client + diff --git a/python-google-auth-httplib2.changes b/python-google-auth-httplib2.changes index 8e64d5d..84680be 100644 --- a/python-google-auth-httplib2.changes +++ b/python-google-auth-httplib2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Jun 8 11:42:08 UTC 2022 - pgajdos@suse.com + +- do not require python-mock for build +- added patches + fix https://github.com/googleapis/google-auth-library-python-httplib2/issues/68 + + python-google-auth-httplib2-no-mock.patch + ------------------------------------------------------------------- Mon Aug 23 11:45:51 UTC 2021 - John Paul Adrian Glaubitz diff --git a/python-google-auth-httplib2.spec b/python-google-auth-httplib2.spec index 5631f79..261fcff 100644 --- a/python-google-auth-httplib2.spec +++ b/python-google-auth-httplib2.spec @@ -1,7 +1,7 @@ # # spec file for package python-google-auth-httplib2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,10 +25,11 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/GoogleCloudPlatform/google-auth-library-python-httplib2 Source: https://files.pythonhosted.org/packages/source/g/google-auth-httplib2/google-auth-httplib2-%{version}.tar.gz +# https://github.com/googleapis/google-auth-library-python-httplib2/issues/68 +Patch0: python-google-auth-httplib2-no-mock.patch BuildRequires: %{python_module Flask} BuildRequires: %{python_module google-auth} BuildRequires: %{python_module httplib2 >= 0.15.0} -BuildRequires: %{python_module mock} BuildRequires: %{python_module pytest-localserver} BuildRequires: %{python_module pytest} BuildRequires: %{python_module setuptools} @@ -46,6 +47,7 @@ This library provides an `httplib2`_ transport for `google-auth`_. %prep %setup -q -n google-auth-httplib2-%{version} +%patch0 -p1 %build %python_build