From 2c8f8c46cfe65edda2cd2357d5e4424be5ecfbdc480612c75a5d23714e6027d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 22 Jul 2019 08:09:21 +0000 Subject: [PATCH] - Add patch to build with pytest5: * pytest5.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-auth?expand=0&rev=14 --- pytest5.patch | 13 +++++++++++++ python-google-auth.changes | 6 ++++++ python-google-auth.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 pytest5.patch diff --git a/pytest5.patch b/pytest5.patch new file mode 100644 index 0000000..ce266b4 --- /dev/null +++ b/pytest5.patch @@ -0,0 +1,13 @@ +Index: google-auth-1.6.3/tests/test__default.py +=================================================================== +--- google-auth-1.6.3.orig/tests/test__default.py ++++ google-auth-1.6.3/tests/test__default.py +@@ -92,7 +92,7 @@ def test__load_credentials_from_file_aut + + + def test__load_credentials_from_file_authorized_user_cloud_sdk(): +- with pytest.warns(UserWarning, matches='Cloud SDK'): ++ with pytest.warns(UserWarning, match='Cloud SDK'): + credentials, project_id = _default._load_credentials_from_file( + AUTHORIZED_USER_CLOUD_SDK_FILE) + assert isinstance(credentials, google.oauth2.credentials.Credentials) diff --git a/python-google-auth.changes b/python-google-auth.changes index 449cb8d..8c13745 100644 --- a/python-google-auth.changes +++ b/python-google-auth.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 22 08:06:53 UTC 2019 - Tomáš Chvátal + +- Add patch to build with pytest5: + * pytest5.patch + ------------------------------------------------------------------- Fri Mar 15 10:53:23 UTC 2019 - Tomáš Chvátal diff --git a/python-google-auth.spec b/python-google-auth.spec index e973110..8482ee1 100644 --- a/python-google-auth.spec +++ b/python-google-auth.spec @@ -25,6 +25,7 @@ License: Apache-2.0 Group: Development/Languages/Python URL: https://github.com/GoogleCloudPlatform/google-auth-library-python Source: https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-%{version}.tar.gz +Patch0: pytest5.patch BuildRequires: %{python_module Flask} BuildRequires: %{python_module cachetools} BuildRequires: %{python_module cryptography} @@ -61,6 +62,7 @@ This library simplifies using Google’s various server-to-server authentication %prep %setup -q -n google-auth-%{version} +%patch0 -p1 %build %python_build