pool/python-google-auth
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1072127 from home:dirkmueller:acdc

Browse Source 
- Remove conflicts and clean up SPEC file.

OBS-URL: https://build.opensuse.org/request/show/1072127
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-auth?expand=0&rev=56
This commit is contained in:
Matej Cepl 2023-03-15 14:34:28 +00:00 committed by Git OBS Bridge
parent 714215fd61
commit 73ed1a413d
4 changed files with 230 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
no-python3.patch
View File

@ -1,7 +1,10 @@
diff -Nru google-auth-2.16.1.orig/tests/test__cloud_sdk.py google-auth-2.16.1/tests/test__cloud_sdk.py
--- google-auth-2.16.1.orig/tests/test__cloud_sdk.py 2023-03-02 12:24:06.384913745 +0100
+++ google-auth-2.16.1/tests/test__cloud_sdk.py 2023-03-02 12:24:46.165672899 +0100
@@ -16,6 +16,7 @@
---
tests/test__cloud_sdk.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/tests/test__cloud_sdk.py
+++ b/tests/test__cloud_sdk.py
@@ -16,6 +16,7 @@ import io
import json
import os
import subprocess
@ -9,7 +12,7 @@ diff -Nru google-auth-2.16.1.orig/tests/test__cloud_sdk.py google-auth-2.16.1/te
from unittest import mock
import pytest # type: ignore
@@ -73,7 +74,7 @@
@@ -73,7 +74,7 @@ def test_get_project_id_call_error(check
def test__run_subprocess_ignore_stderr():
command = [

427
python-google-auth-no-mock.patch
View File

@ -1,6 +1,51 @@
diff -Nru google-auth-2.16.1.orig/tests/compute_engine/test_credentials.py google-auth-2.16.1/tests/compute_engine/test_credentials.py
--- google-auth-2.16.1.orig/tests/compute_engine/test_credentials.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/compute_engine/test_credentials.py 2023-03-02 11:59:04.134850027 +0100
---
tests/compute_engine/test__metadata.py | 2 +-
tests/compute_engine/test_credentials.py | 2 +-
tests/conftest.py | 2 +-
tests/crypt/test__python_rsa.py | 2 +-
tests/oauth2/test__client.py | 2 +-
tests/oauth2/test_challenges.py | 2 +-
tests/oauth2/test_credentials.py | 2 +-
tests/oauth2/test_gdch_credentials.py | 2 +-
tests/oauth2/test_id_token.py | 2 +-
tests/oauth2/test_reauth.py | 2 +-
tests/oauth2/test_service_account.py | 2 +-
tests/oauth2/test_sts.py | 2 +-
tests/test__cloud_sdk.py | 2 +-
tests/test__default.py | 2 +-
tests/test__exponential_backoff.py | 2 +-
tests/test__oauth2client.py | 2 +-
tests/test_app_engine.py | 2 +-
tests/test_aws.py | 2 +-
tests/test_downscoped.py | 2 +-
tests/test_external_account.py | 2 +-
tests/test_external_account_authorized_user.py | 2 +-
tests/test_iam.py | 2 +-
tests/test_identity_pool.py | 2 +-
tests/test_impersonated_credentials.py | 2 +-
tests/test_jwt.py | 2 +-
tests/test_pluggable.py | 2 +-
tests/transport/test__custom_tls_signer.py | 2 +-
tests/transport/test__mtls_helper.py | 2 +-
tests/transport/test_grpc.py | 2 +-
tests/transport/test_mtls.py | 2 +-
tests/transport/test_requests.py | 2 +-
tests/transport/test_urllib3.py | 2 +-
32 files changed, 32 insertions(+), 32 deletions(-)
--- a/tests/compute_engine/test__metadata.py
+++ b/tests/compute_engine/test__metadata.py
@@ -16,7 +16,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import reload_module
--- a/tests/compute_engine/test_credentials.py
+++ b/tests/compute_engine/test_credentials.py
@@ -14,7 +14,7 @@
import base64
import datetime
@ -10,21 +55,8 @@ diff -Nru google-auth-2.16.1.orig/tests/compute_engine/test_credentials.py googl
import pytest # type: ignore
import responses # type: ignore
diff -Nru google-auth-2.16.1.orig/tests/compute_engine/test__metadata.py google-auth-2.16.1/tests/compute_engine/test__metadata.py
--- google-auth-2.16.1.orig/tests/compute_engine/test__metadata.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/compute_engine/test__metadata.py 2023-03-02 11:59:04.138850079 +0100
@@ -16,7 +16,7 @@
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import reload_module
diff -Nru google-auth-2.16.1.orig/tests/conftest.py google-auth-2.16.1/tests/conftest.py
--- google-auth-2.16.1.orig/tests/conftest.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/conftest.py 2023-03-02 11:59:04.070849194 +0100
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -15,7 +15,7 @@
import os
import sys
@ -34,9 +66,8 @@ diff -Nru google-auth-2.16.1.orig/tests/conftest.py google-auth-2.16.1/tests/con
import pytest # type: ignore
diff -Nru google-auth-2.16.1.orig/tests/crypt/test__python_rsa.py google-auth-2.16.1/tests/crypt/test__python_rsa.py
--- google-auth-2.16.1.orig/tests/crypt/test__python_rsa.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/crypt/test__python_rsa.py 2023-03-02 11:59:04.158850340 +0100
--- a/tests/crypt/test__python_rsa.py
+++ b/tests/crypt/test__python_rsa.py
@@ -15,7 +15,7 @@
import json
import os
@ -46,9 +77,19 @@ diff -Nru google-auth-2.16.1.orig/tests/crypt/test__python_rsa.py google-auth-2.
from pyasn1_modules import pem # type: ignore
import pytest # type: ignore
import rsa # type: ignore
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_challenges.py google-auth-2.16.1/tests/oauth2/test_challenges.py
--- google-auth-2.16.1.orig/tests/oauth2/test_challenges.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_challenges.py 2023-03-02 11:59:04.114849767 +0100
--- a/tests/oauth2/test__client.py
+++ b/tests/oauth2/test__client.py
@@ -16,7 +16,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
import six
from six.moves import http_client
--- a/tests/oauth2/test_challenges.py
+++ b/tests/oauth2/test_challenges.py
@@ -17,7 +17,7 @@
import base64
import sys
@ -58,22 +99,9 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_challenges.py google-auth-2.
import pytest # type: ignore
import pyu2f # type: ignore
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test__client.py google-auth-2.16.1/tests/oauth2/test__client.py
--- google-auth-2.16.1.orig/tests/oauth2/test__client.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test__client.py 2023-03-02 11:59:04.106849663 +0100
@@ -16,7 +16,7 @@
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
import six
from six.moves import http_client
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_credentials.py google-auth-2.16.1/tests/oauth2/test_credentials.py
--- google-auth-2.16.1.orig/tests/oauth2/test_credentials.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_credentials.py 2023-03-02 11:59:04.110849715 +0100
@@ -18,7 +18,7 @@
--- a/tests/oauth2/test_credentials.py
+++ b/tests/oauth2/test_credentials.py
@@ -18,7 +18,7 @@ import os
import pickle
import sys
@ -82,10 +110,9 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_credentials.py google-auth-2
import pytest # type: ignore
from google.auth import _helpers
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_gdch_credentials.py google-auth-2.16.1/tests/oauth2/test_gdch_credentials.py
--- google-auth-2.16.1.orig/tests/oauth2/test_gdch_credentials.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_gdch_credentials.py 2023-03-02 11:59:04.102849611 +0100
@@ -17,7 +17,7 @@
--- a/tests/oauth2/test_gdch_credentials.py
+++ b/tests/oauth2/test_gdch_credentials.py
@@ -17,7 +17,7 @@ import datetime
import json
import os
@ -94,9 +121,8 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_gdch_credentials.py google-a
import pytest # type: ignore
import requests
import six
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_id_token.py google-auth-2.16.1/tests/oauth2/test_id_token.py
--- google-auth-2.16.1.orig/tests/oauth2/test_id_token.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_id_token.py 2023-03-02 11:59:04.106849663 +0100
--- a/tests/oauth2/test_id_token.py
+++ b/tests/oauth2/test_id_token.py
@@ -15,7 +15,7 @@
import json
import os
@ -106,9 +132,8 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_id_token.py google-auth-2.16
import pytest # type: ignore
from google.auth import environment_vars
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_reauth.py google-auth-2.16.1/tests/oauth2/test_reauth.py
--- google-auth-2.16.1.orig/tests/oauth2/test_reauth.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_reauth.py 2023-03-02 11:59:04.110849715 +0100
--- a/tests/oauth2/test_reauth.py
+++ b/tests/oauth2/test_reauth.py
@@ -14,7 +14,7 @@
import copy
@ -118,10 +143,9 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_reauth.py google-auth-2.16.1
import pytest # type: ignore
from google.auth import exceptions
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_service_account.py google-auth-2.16.1/tests/oauth2/test_service_account.py
--- google-auth-2.16.1.orig/tests/oauth2/test_service_account.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_service_account.py 2023-03-02 11:59:04.106849663 +0100
@@ -16,7 +16,7 @@
--- a/tests/oauth2/test_service_account.py
+++ b/tests/oauth2/test_service_account.py
@@ -16,7 +16,7 @@ import datetime
import json
import os
@ -130,9 +154,8 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_service_account.py google-au
from google.auth import _helpers
from google.auth import crypt
diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_sts.py google-auth-2.16.1/tests/oauth2/test_sts.py
--- google-auth-2.16.1.orig/tests/oauth2/test_sts.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/oauth2/test_sts.py 2023-03-02 11:59:04.118849819 +0100
--- a/tests/oauth2/test_sts.py
+++ b/tests/oauth2/test_sts.py
@@ -14,7 +14,7 @@
import json
@ -142,34 +165,9 @@ diff -Nru google-auth-2.16.1.orig/tests/oauth2/test_sts.py google-auth-2.16.1/te
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
diff -Nru google-auth-2.16.1.orig/tests/test_app_engine.py google-auth-2.16.1/tests/test_app_engine.py
--- google-auth-2.16.1.orig/tests/test_app_engine.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_app_engine.py 2023-03-02 11:59:04.094849506 +0100
@@ -14,7 +14,7 @@
import datetime
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import app_engine
diff -Nru google-auth-2.16.1.orig/tests/test_aws.py google-auth-2.16.1/tests/test_aws.py
--- google-auth-2.16.1.orig/tests/test_aws.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_aws.py 2023-03-02 11:59:04.166850444 +0100
@@ -16,7 +16,7 @@
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
diff -Nru google-auth-2.16.1.orig/tests/test__cloud_sdk.py google-auth-2.16.1/tests/test__cloud_sdk.py
--- google-auth-2.16.1.orig/tests/test__cloud_sdk.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test__cloud_sdk.py 2023-03-02 11:59:04.098849558 +0100
@@ -17,7 +17,7 @@
--- a/tests/test__cloud_sdk.py
+++ b/tests/test__cloud_sdk.py
@@ -17,7 +17,7 @@ import json
import os
import subprocess
@ -178,9 +176,8 @@ diff -Nru google-auth-2.16.1.orig/tests/test__cloud_sdk.py google-auth-2.16.1/te
import pytest # type: ignore
from google.auth import _cloud_sdk
diff -Nru google-auth-2.16.1.orig/tests/test__default.py google-auth-2.16.1/tests/test__default.py
--- google-auth-2.16.1.orig/tests/test__default.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test__default.py 2023-03-02 11:59:04.126849923 +0100
--- a/tests/test__default.py
+++ b/tests/test__default.py
@@ -15,7 +15,7 @@
import json
import os
@ -190,21 +187,8 @@ diff -Nru google-auth-2.16.1.orig/tests/test__default.py google-auth-2.16.1/test
import pytest # type: ignore
from google.auth import _default
diff -Nru google-auth-2.16.1.orig/tests/test_downscoped.py google-auth-2.16.1/tests/test_downscoped.py
--- google-auth-2.16.1.orig/tests/test_downscoped.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_downscoped.py 2023-03-02 11:59:04.134850027 +0100
@@ -15,7 +15,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
diff -Nru google-auth-2.16.1.orig/tests/test__exponential_backoff.py google-auth-2.16.1/tests/test__exponential_backoff.py
--- google-auth-2.16.1.orig/tests/test__exponential_backoff.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test__exponential_backoff.py 2023-03-02 11:59:04.066849142 +0100
--- a/tests/test__exponential_backoff.py
+++ b/tests/test__exponential_backoff.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
@ -214,82 +198,9 @@ diff -Nru google-auth-2.16.1.orig/tests/test__exponential_backoff.py google-auth
from google.auth import _exponential_backoff
diff -Nru google-auth-2.16.1.orig/tests/test_external_account_authorized_user.py google-auth-2.16.1/tests/test_external_account_authorized_user.py
--- google-auth-2.16.1.orig/tests/test_external_account_authorized_user.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_external_account_authorized_user.py 2023-03-02 11:59:04.130849975 +0100
@@ -15,7 +15,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
diff -Nru google-auth-2.16.1.orig/tests/test_external_account.py google-auth-2.16.1/tests/test_external_account.py
--- google-auth-2.16.1.orig/tests/test_external_account.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_external_account.py 2023-03-02 11:59:04.070849194 +0100
@@ -15,7 +15,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
diff -Nru google-auth-2.16.1.orig/tests/test_iam.py google-auth-2.16.1/tests/test_iam.py
--- google-auth-2.16.1.orig/tests/test_iam.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_iam.py 2023-03-02 11:59:04.142850132 +0100
@@ -16,7 +16,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
diff -Nru google-auth-2.16.1.orig/tests/test_identity_pool.py google-auth-2.16.1/tests/test_identity_pool.py
--- google-auth-2.16.1.orig/tests/test_identity_pool.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_identity_pool.py 2023-03-02 11:59:04.146850184 +0100
@@ -16,7 +16,7 @@
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
diff -Nru google-auth-2.16.1.orig/tests/test_impersonated_credentials.py google-auth-2.16.1/tests/test_impersonated_credentials.py
--- google-auth-2.16.1.orig/tests/test_impersonated_credentials.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_impersonated_credentials.py 2023-03-02 11:59:04.162850392 +0100
@@ -19,7 +19,7 @@
# Because Python 2.7
# from typing import List
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
diff -Nru google-auth-2.16.1.orig/tests/test_jwt.py google-auth-2.16.1/tests/test_jwt.py
--- google-auth-2.16.1.orig/tests/test_jwt.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_jwt.py 2023-03-02 11:59:04.150850236 +0100
@@ -17,7 +17,7 @@
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
diff -Nru google-auth-2.16.1.orig/tests/test__oauth2client.py google-auth-2.16.1/tests/test__oauth2client.py
--- google-auth-2.16.1.orig/tests/test__oauth2client.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test__oauth2client.py 2023-03-02 11:59:04.094849506 +0100
@@ -16,7 +16,7 @@
--- a/tests/test__oauth2client.py
+++ b/tests/test__oauth2client.py
@@ -16,7 +16,7 @@ import datetime
import os
import sys
@ -298,10 +209,108 @@ diff -Nru google-auth-2.16.1.orig/tests/test__oauth2client.py google-auth-2.16.1
import pytest # type: ignore
from six.moves import reload_module
diff -Nru google-auth-2.16.1.orig/tests/test_pluggable.py google-auth-2.16.1/tests/test_pluggable.py
--- google-auth-2.16.1.orig/tests/test_pluggable.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/test_pluggable.py 2023-03-02 11:59:04.162850392 +0100
@@ -17,7 +17,7 @@
--- a/tests/test_app_engine.py
+++ b/tests/test_app_engine.py
@@ -14,7 +14,7 @@
import datetime
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import app_engine
--- a/tests/test_aws.py
+++ b/tests/test_aws.py
@@ -16,7 +16,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
--- a/tests/test_downscoped.py
+++ b/tests/test_downscoped.py
@@ -15,7 +15,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
--- a/tests/test_external_account.py
+++ b/tests/test_external_account.py
@@ -15,7 +15,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
--- a/tests/test_external_account_authorized_user.py
+++ b/tests/test_external_account_authorized_user.py
@@ -15,7 +15,7 @@
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
--- a/tests/test_iam.py
+++ b/tests/test_iam.py
@@ -16,7 +16,7 @@ import base64
import datetime
import json
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
--- a/tests/test_identity_pool.py
+++ b/tests/test_identity_pool.py
@@ -16,7 +16,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
from six.moves import urllib
--- a/tests/test_impersonated_credentials.py
+++ b/tests/test_impersonated_credentials.py
@@ -19,7 +19,7 @@ import os
# Because Python 2.7
# from typing import List
-import mock
+from unittest import mock
import pytest # type: ignore
from six.moves import http_client
--- a/tests/test_jwt.py
+++ b/tests/test_jwt.py
@@ -17,7 +17,7 @@ import datetime
import json
import os
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
--- a/tests/test_pluggable.py
+++ b/tests/test_pluggable.py
@@ -17,7 +17,7 @@ import json
import os
import subprocess
@ -310,10 +319,9 @@ diff -Nru google-auth-2.16.1.orig/tests/test_pluggable.py google-auth-2.16.1/tes
import pytest # type: ignore
# from six.moves import http_client
diff -Nru google-auth-2.16.1.orig/tests/transport/test__custom_tls_signer.py google-auth-2.16.1/tests/transport/test__custom_tls_signer.py
--- google-auth-2.16.1.orig/tests/transport/test__custom_tls_signer.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/transport/test__custom_tls_signer.py 2023-03-02 11:59:04.078849298 +0100
@@ -16,7 +16,7 @@
--- a/tests/transport/test__custom_tls_signer.py
+++ b/tests/transport/test__custom_tls_signer.py
@@ -16,7 +16,7 @@ import base64
import ctypes
import os
@ -322,21 +330,8 @@ diff -Nru google-auth-2.16.1.orig/tests/transport/test__custom_tls_signer.py goo
import pytest # type: ignore
from requests.packages.urllib3.util.ssl_ import create_urllib3_context # type: ignore
import urllib3.contrib.pyopenssl # type: ignore
diff -Nru google-auth-2.16.1.orig/tests/transport/test_grpc.py google-auth-2.16.1/tests/transport/test_grpc.py
--- google-auth-2.16.1.orig/tests/transport/test_grpc.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/transport/test_grpc.py 2023-03-02 11:59:04.078849298 +0100
@@ -16,7 +16,7 @@
import os
import time
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
diff -Nru google-auth-2.16.1.orig/tests/transport/test__mtls_helper.py google-auth-2.16.1/tests/transport/test__mtls_helper.py
--- google-auth-2.16.1.orig/tests/transport/test__mtls_helper.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/transport/test__mtls_helper.py 2023-03-02 11:59:04.086849402 +0100
--- a/tests/transport/test__mtls_helper.py
+++ b/tests/transport/test__mtls_helper.py
@@ -15,7 +15,7 @@
import os
import re
@ -346,9 +341,19 @@ diff -Nru google-auth-2.16.1.orig/tests/transport/test__mtls_helper.py google-au
from OpenSSL import crypto
import pytest # type: ignore
diff -Nru google-auth-2.16.1.orig/tests/transport/test_mtls.py google-auth-2.16.1/tests/transport/test_mtls.py
--- google-auth-2.16.1.orig/tests/transport/test_mtls.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/transport/test_mtls.py 2023-03-02 11:59:04.086849402 +0100
--- a/tests/transport/test_grpc.py
+++ b/tests/transport/test_grpc.py
@@ -16,7 +16,7 @@ import datetime
import os
import time
-import mock
+from unittest import mock
import pytest # type: ignore
from google.auth import _helpers
--- a/tests/transport/test_mtls.py
+++ b/tests/transport/test_mtls.py
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
@ -358,10 +363,9 @@ diff -Nru google-auth-2.16.1.orig/tests/transport/test_mtls.py google-auth-2.16.
import pytest # type: ignore
from google.auth import exceptions
diff -Nru google-auth-2.16.1.orig/tests/transport/test_requests.py google-auth-2.16.1/tests/transport/test_requests.py
--- google-auth-2.16.1.orig/tests/transport/test_requests.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/transport/test_requests.py 2023-03-02 11:59:04.090849454 +0100
@@ -18,7 +18,7 @@
--- a/tests/transport/test_requests.py
+++ b/tests/transport/test_requests.py
@@ -18,7 +18,7 @@ import os
import sys
import freezegun
@ -370,9 +374,8 @@ diff -Nru google-auth-2.16.1.orig/tests/transport/test_requests.py google-auth-2
import OpenSSL
import pytest # type: ignore
import requests
diff -Nru google-auth-2.16.1.orig/tests/transport/test_urllib3.py google-auth-2.16.1/tests/transport/test_urllib3.py
--- google-auth-2.16.1.orig/tests/transport/test_urllib3.py 2023-02-17 21:41:23.000000000 +0100
+++ google-auth-2.16.1/tests/transport/test_urllib3.py 2023-03-02 11:59:04.074849246 +0100
--- a/tests/transport/test_urllib3.py
+++ b/tests/transport/test_urllib3.py
@@ -15,7 +15,7 @@
import os
import sys

5
python-google-auth.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 6 17:10:45 UTC 2023 - Matej Cepl <mcepl@suse.com>
- Remove conflicts and clean up SPEC file.
-------------------------------------------------------------------
Thu Mar 2 11:21:16 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>

4
python-google-auth.spec
View File

@ -25,10 +25,10 @@ License: Apache-2.0
URL: https://github.com/googleapis/google-auth-library-python
Source: https://files.pythonhosted.org/packages/source/g/google-auth/google-auth-%{version}.tar.gz
# https://github.com/googleapis/google-auth-library-python/issues/1055
Patch0: python-google-auth-no-mock.patch
Patch1: python-google-auth-no-mock.patch
# PATCH-FIX-UPSTREAM no-python3.patch gh#googleapis/google-auth-library-python!1233 mcepl@suse.com
# don't use 'python3' literal when you mean sys.executable
Patch1: no-python3.patch
Patch2: no-python3.patch
BuildRequires: %{python_module Flask}
# START TESTING SECTION
BuildRequires: %{python_module aiohttp >= 3.6.2}