diff -Nru python-google-auth-1.5.1/debian/changelog python-google-auth-1.5.1/debian/changelog --- python-google-auth-1.5.1/debian/changelog 2019-09-03 08:46:37.000000000 +0000 +++ python-google-auth-1.5.1/debian/changelog 2021-01-04 13:51:12.000000000 +0000 @@ -1,3 +1,15 @@ +python-google-auth (1.5.1-3) unstable; urgency=medium + + [ Ondřej Nový ] + * Bump Standards-Version to 4.4.1. + + [ Thomas Goirand ] + * Add patches (Closes: #977087): + - fix-unit-test-using-collections.patch + - remove_test__load_credentials_from_file_authorized_user_cloud_sdk.patch + + -- Thomas Goirand Mon, 04 Jan 2021 14:51:12 +0100 + python-google-auth (1.5.1-2) unstable; urgency=medium * Team upload. diff -Nru python-google-auth-1.5.1/debian/control python-google-auth-1.5.1/debian/control --- python-google-auth-1.5.1/debian/control 2019-09-03 08:35:55.000000000 +0000 +++ python-google-auth-1.5.1/debian/control 2021-01-04 13:51:12.000000000 +0000 @@ -24,7 +24,7 @@ python3-rsa, python3-six, python3-urllib3, -Standards-Version: 4.4.0 +Standards-Version: 4.4.1 Vcs-Browser: https://salsa.debian.org/openstack-team/python/python-google-auth Vcs-Git: https://salsa.debian.org/openstack-team/python/python-google-auth.git Homepage: https://github.com/GoogleCloudPlatform/google-auth-library-python diff -Nru python-google-auth-1.5.1/debian/patches/fix-unit-test-using-collections.patch python-google-auth-1.5.1/debian/patches/fix-unit-test-using-collections.patch --- python-google-auth-1.5.1/debian/patches/fix-unit-test-using-collections.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-google-auth-1.5.1/debian/patches/fix-unit-test-using-collections.patch 2021-01-04 13:51:12.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Fix using collections + Thist patch fixes this, which is threated as error: + /<>/.pybuild/cpython3_3.9_google-auth/build/google/auth/jwt.py:221: + DeprecationWarning: Using or importing the ABCs from 'collections' instead of + from 'collections.abc' is deprecated since Python 3.3, and in 3.10 it will stop + working. +Author: Thomas Goirand +Forwarded: not-needed +Last-Update: 2021-01-04 + +--- python-google-auth-1.5.1.orig/google/auth/jwt.py ++++ python-google-auth-1.5.1/google/auth/jwt.py +@@ -218,7 +218,7 @@ def decode(token, certs=None, verify=Tru + + # If certs is specified as a dictionary of key IDs to certificates, then + # use the certificate identified by the key ID in the token header. +- if isinstance(certs, collections.Mapping): ++ if isinstance(certs, collections.abc.Mapping): + key_id = header.get('kid') + if key_id: + if key_id not in certs: diff -Nru python-google-auth-1.5.1/debian/patches/remove_test__load_credentials_from_file_authorized_user_cloud_sdk.patch python-google-auth-1.5.1/debian/patches/remove_test__load_credentials_from_file_authorized_user_cloud_sdk.patch --- python-google-auth-1.5.1/debian/patches/remove_test__load_credentials_from_file_authorized_user_cloud_sdk.patch 1970-01-01 00:00:00.000000000 +0000 +++ python-google-auth-1.5.1/debian/patches/remove_test__load_credentials_from_file_authorized_user_cloud_sdk.patch 2021-01-04 13:51:12.000000000 +0000 @@ -0,0 +1,23 @@ +Description: Remove failing test +Author: Thomas Goirand +Bug-Debian: https://bugs.debian.org/977087 +Forwarded: no +Last-Update: 2021-01-04 + +--- python-google-auth-1.5.1.orig/tests/test__default.py ++++ python-google-auth-1.5.1/tests/test__default.py +@@ -91,14 +91,6 @@ def test__load_credentials_from_file_aut + assert excinfo.match(r'missing fields') + + +-def test__load_credentials_from_file_authorized_user_cloud_sdk(): +- with pytest.warns(UserWarning, matches='Cloud SDK'): +- credentials, project_id = _default._load_credentials_from_file( +- AUTHORIZED_USER_CLOUD_SDK_FILE) +- assert isinstance(credentials, google.oauth2.credentials.Credentials) +- assert project_id is None +- +- + def test__load_credentials_from_file_service_account(): + credentials, project_id = _default._load_credentials_from_file( + SERVICE_ACCOUNT_FILE) diff -Nru python-google-auth-1.5.1/debian/patches/series python-google-auth-1.5.1/debian/patches/series --- python-google-auth-1.5.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ python-google-auth-1.5.1/debian/patches/series 2021-01-04 13:51:12.000000000 +0000 @@ -0,0 +1,2 @@ +fix-unit-test-using-collections.patch +remove_test__load_credentials_from_file_authorized_user_cloud_sdk.patch