From 17ab4fa26b1b61af98795fbd9df53d208156086cb544e1f81dc3405b1f5bcb50 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Mon, 13 Sep 2021 01:42:38 +0000 Subject: [PATCH] - Update to 2.20.0: * Adds support for errors.py to also use 'errors' for error_details (#1281) (a5d2081) * add status_code property on http error handling (#1185) (db2a766) * Change default of static_discovery when discoveryServiceUrl set (#1261) (3b4f2e2) * correct api version in oauth-installed.md (#1258) (d1a255f) * fix .close() (#1231) (a9583f7) * Resolve issue where num_retries would have no effect (#1244) (c518472) * Include discovery artifacts in published package (#1221) (ad618d0) * Require Python 3.6+ * Add support for using static discovery documents (#1109) (32d1c59) * Update synth.py to copy discovery files from discovery-artifact-manager (#1104) (af918e8) * Catch ECONNRESET and other errors more reliably (#1147) (ae9cd99) * deps: add upper-bound google-auth dependency (#1180) (c687f42) * handle error on service not enabled (#1117) (c691283) * Improve support for error_details (#1126) (e6a1da3) * MediaFileUpload error if file does not exist (#1127) (2c6d029) * replace deprecated socket.error with OSError (#1161) (b7b9986) * Use logging level info when file_cache is not available (#1125) (0b32e69) * add httplib2 authorization to thread_safety (#1005) (205ae59), closes #808 * Change error parsing to check for 'message' (#1083) (a341c5a), closes #1082 * don't raise when downloading zero byte files (#1074) (86d8788) - Refreshed python-google-api-python-client-no-unittest2.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-api-python-client?expand=0&rev=42 --- google-api-python-client-1.12.8.tar.gz | 3 - google-api-python-client-2.20.0.tar.gz | 3 + ...oogle-api-python-client-no-unittest2.patch | 109 ++++++++++-------- python-google-api-python-client.changes | 26 +++++ python-google-api-python-client.spec | 8 +- 5 files changed, 93 insertions(+), 56 deletions(-) delete mode 100644 google-api-python-client-1.12.8.tar.gz create mode 100644 google-api-python-client-2.20.0.tar.gz diff --git a/google-api-python-client-1.12.8.tar.gz b/google-api-python-client-1.12.8.tar.gz deleted file mode 100644 index 4daec1d..0000000 --- a/google-api-python-client-1.12.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3b9684442eec2cfe9f9bb48e796ef919456b82142c7528c5fd527e5224f08bb -size 146684 diff --git a/google-api-python-client-2.20.0.tar.gz b/google-api-python-client-2.20.0.tar.gz new file mode 100644 index 0000000..d599b23 --- /dev/null +++ b/google-api-python-client-2.20.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:102dfe41455ac017796b2da2ec144ac7d66c55c369cb7cbc9480e29c046b055f +size 7081312 diff --git a/python-google-api-python-client-no-unittest2.patch b/python-google-api-python-client-no-unittest2.patch index 6912de7..9bd83e8 100644 --- a/python-google-api-python-client-no-unittest2.patch +++ b/python-google-api-python-client-no-unittest2.patch @@ -1,7 +1,8 @@ -diff -Nru google-api-python-client-1.11.0.orig/tests/test__auth.py google-api-python-client-1.11.0/tests/test__auth.py ---- google-api-python-client-1.11.0.orig/tests/test__auth.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test__auth.py 2020-09-10 15:54:13.243410474 +0200 -@@ -18,7 +18,7 @@ +Index: google-api-python-client-2.20.0/tests/test__auth.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test__auth.py ++++ google-api-python-client-2.20.0/tests/test__auth.py +@@ -18,7 +18,7 @@ import google.auth.credentials import google_auth_httplib2 import httplib2 import oauth2client.client @@ -10,10 +11,11 @@ diff -Nru google-api-python-client-1.11.0.orig/tests/test__auth.py google-api-py from googleapiclient import _auth -diff -Nru google-api-python-client-1.11.0.orig/tests/test_channel.py google-api-python-client-1.11.0/tests/test_channel.py ---- google-api-python-client-1.11.0.orig/tests/test_channel.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_channel.py 2020-09-10 15:54:13.243410474 +0200 -@@ -3,7 +3,7 @@ +Index: google-api-python-client-2.20.0/tests/test_channel.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_channel.py ++++ google-api-python-client-2.20.0/tests/test_channel.py +@@ -3,7 +3,7 @@ from __future__ import absolute_import __author__ = "jcgregorio@google.com (Joe Gregorio)" @@ -22,9 +24,10 @@ diff -Nru google-api-python-client-1.11.0.orig/tests/test_channel.py google-api- import datetime from googleapiclient import channel -diff -Nru google-api-python-client-1.11.0.orig/tests/test_discovery_cache.py google-api-python-client-1.11.0/tests/test_discovery_cache.py ---- google-api-python-client-1.11.0.orig/tests/test_discovery_cache.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_discovery_cache.py 2020-09-10 15:54:13.243410474 +0200 +Index: google-api-python-client-2.20.0/tests/test_discovery_cache.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_discovery_cache.py ++++ google-api-python-client-2.20.0/tests/test_discovery_cache.py @@ -18,7 +18,7 @@ """Discovery document cache tests.""" @@ -34,22 +37,24 @@ diff -Nru google-api-python-client-1.11.0.orig/tests/test_discovery_cache.py goo import mock -diff -Nru google-api-python-client-1.11.0.orig/tests/test_discovery.py google-api-python-client-1.11.0/tests/test_discovery.py ---- google-api-python-client-1.11.0.orig/tests/test_discovery.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_discovery.py 2020-09-10 15:54:40.883760261 +0200 -@@ -37,7 +37,7 @@ +Index: google-api-python-client-2.20.0/tests/test_discovery.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_discovery.py ++++ google-api-python-client-2.20.0/tests/test_discovery.py +@@ -35,7 +35,7 @@ import os import pickle import re import sys -import unittest2 as unittest +import unittest - from collections import defaultdict + import urllib from parameterized import parameterized -diff -Nru google-api-python-client-1.11.0.orig/tests/test_errors.py google-api-python-client-1.11.0/tests/test_errors.py ---- google-api-python-client-1.11.0.orig/tests/test_errors.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_errors.py 2020-09-10 15:54:13.247410524 +0200 -@@ -21,7 +21,7 @@ +Index: google-api-python-client-2.20.0/tests/test_errors.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_errors.py ++++ google-api-python-client-2.20.0/tests/test_errors.py +@@ -21,7 +21,7 @@ from __future__ import absolute_import __author__ = "afshar@google.com (Ali Afshar)" @@ -58,34 +63,37 @@ diff -Nru google-api-python-client-1.11.0.orig/tests/test_errors.py google-api-p import httplib2 -diff -Nru google-api-python-client-1.11.0.orig/tests/test_http.py google-api-python-client-1.11.0/tests/test_http.py ---- google-api-python-client-1.11.0.orig/tests/test_http.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_http.py 2020-09-10 15:54:13.247410524 +0200 -@@ -35,7 +35,7 @@ +Index: google-api-python-client-2.20.0/tests/test_http.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_http.py ++++ google-api-python-client-2.20.0/tests/test_http.py +@@ -31,7 +31,7 @@ import io import logging import mock import os -import unittest2 as unittest +import unittest + import urllib import random import socket - import ssl -diff -Nru google-api-python-client-1.11.0.orig/tests/test_json_model.py google-api-python-client-1.11.0/tests/test_json_model.py ---- google-api-python-client-1.11.0.orig/tests/test_json_model.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_json_model.py 2020-09-10 15:54:13.247410524 +0200 -@@ -28,7 +28,7 @@ - import os +Index: google-api-python-client-2.20.0/tests/test_json_model.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_json_model.py ++++ google-api-python-client-2.20.0/tests/test_json_model.py +@@ -26,7 +26,7 @@ import httplib2 + import json import pkg_resources import platform -import unittest2 as unittest +import unittest - import httplib2 - import googleapiclient.model + import urllib -diff -Nru google-api-python-client-1.11.0.orig/tests/test_mocks.py google-api-python-client-1.11.0/tests/test_mocks.py ---- google-api-python-client-1.11.0.orig/tests/test_mocks.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_mocks.py 2020-09-10 15:54:13.247410524 +0200 -@@ -24,7 +24,7 @@ + import googleapiclient.model +Index: google-api-python-client-2.20.0/tests/test_mocks.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_mocks.py ++++ google-api-python-client-2.20.0/tests/test_mocks.py +@@ -24,7 +24,7 @@ __author__ = "jcgregorio@google.com (Joe import httplib2 import os @@ -94,10 +102,11 @@ diff -Nru google-api-python-client-1.11.0.orig/tests/test_mocks.py google-api-py from googleapiclient.errors import HttpError from googleapiclient.errors import UnexpectedBodyError -diff -Nru google-api-python-client-1.11.0.orig/tests/test_model.py google-api-python-client-1.11.0/tests/test_model.py ---- google-api-python-client-1.11.0.orig/tests/test_model.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_model.py 2020-09-10 15:54:13.247410524 +0200 -@@ -23,7 +23,7 @@ +Index: google-api-python-client-2.20.0/tests/test_model.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_model.py ++++ google-api-python-client-2.20.0/tests/test_model.py +@@ -23,7 +23,7 @@ from __future__ import absolute_import __author__ = "jcgregorio@google.com (Joe Gregorio)" @@ -106,22 +115,24 @@ diff -Nru google-api-python-client-1.11.0.orig/tests/test_model.py google-api-py from googleapiclient.model import BaseModel from googleapiclient.model import makepatch -diff -Nru google-api-python-client-1.11.0.orig/tests/test_protobuf_model.py google-api-python-client-1.11.0/tests/test_protobuf_model.py ---- google-api-python-client-1.11.0.orig/tests/test_protobuf_model.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_protobuf_model.py 2020-09-10 15:54:13.247410524 +0200 -@@ -22,7 +22,7 @@ +Index: google-api-python-client-2.20.0/tests/test_protobuf_model.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_protobuf_model.py ++++ google-api-python-client-2.20.0/tests/test_protobuf_model.py +@@ -22,7 +22,7 @@ from __future__ import absolute_import __author__ = "mmcdonald@google.com (Matt McDonald)" -import unittest2 as unittest +import unittest import httplib2 - import googleapiclient.model -diff -Nru google-api-python-client-1.11.0.orig/tests/test_schema.py google-api-python-client-1.11.0/tests/test_schema.py ---- google-api-python-client-1.11.0.orig/tests/test_schema.py 2020-08-27 23:33:51.000000000 +0200 -+++ google-api-python-client-1.11.0/tests/test_schema.py 2020-09-10 15:54:13.247410524 +0200 -@@ -19,7 +19,7 @@ + from googleapiclient.model import ProtocolBufferModel +Index: google-api-python-client-2.20.0/tests/test_schema.py +=================================================================== +--- google-api-python-client-2.20.0.orig/tests/test_schema.py ++++ google-api-python-client-2.20.0/tests/test_schema.py +@@ -19,7 +19,7 @@ __author__ = "jcgregorio@google.com (Joe import json import os diff --git a/python-google-api-python-client.changes b/python-google-api-python-client.changes index 4e8ac4a..7e67c73 100644 --- a/python-google-api-python-client.changes +++ b/python-google-api-python-client.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Mon Sep 13 01:39:48 UTC 2021 - Steve Kowalik + +- Update to 2.20.0: + * Adds support for errors.py to also use 'errors' for error_details (#1281) (a5d2081) + * add status_code property on http error handling (#1185) (db2a766) + * Change default of static_discovery when discoveryServiceUrl set (#1261) (3b4f2e2) + * correct api version in oauth-installed.md (#1258) (d1a255f) + * fix .close() (#1231) (a9583f7) + * Resolve issue where num_retries would have no effect (#1244) (c518472) + * Include discovery artifacts in published package (#1221) (ad618d0) + * Require Python 3.6+ + * Add support for using static discovery documents (#1109) (32d1c59) + * Update synth.py to copy discovery files from discovery-artifact-manager (#1104) (af918e8) + * Catch ECONNRESET and other errors more reliably (#1147) (ae9cd99) + * deps: add upper-bound google-auth dependency (#1180) (c687f42) + * handle error on service not enabled (#1117) (c691283) + * Improve support for error_details (#1126) (e6a1da3) + * MediaFileUpload error if file does not exist (#1127) (2c6d029) + * replace deprecated socket.error with OSError (#1161) (b7b9986) + * Use logging level info when file_cache is not available (#1125) (0b32e69) + * add httplib2 authorization to thread_safety (#1005) (205ae59), closes #808 + * Change error parsing to check for 'message' (#1083) (a341c5a), closes #1082 + * don't raise when downloading zero byte files (#1074) (86d8788) +- Refreshed python-google-api-python-client-no-unittest2.patch + ------------------------------------------------------------------- Mon Jul 5 19:41:14 UTC 2021 - Martin Wilck diff --git a/python-google-api-python-client.spec b/python-google-api-python-client.spec index fa2bbf2..0bc97f9 100644 --- a/python-google-api-python-client.spec +++ b/python-google-api-python-client.spec @@ -17,19 +17,19 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} +%define skip_python2 1 Name: python-google-api-python-client -Version: 1.12.8 +Version: 2.20.0 Release: 0 Summary: Google APIs Python Client License: Apache-2.0 -Group: Development/Languages/Python URL: https://github.com/google/google-api-python-client Source: https://files.pythonhosted.org/packages/source/g/google-api-python-client/google-api-python-client-%{version}.tar.gz # https://github.com/googleapis/google-api-python-client/pull/929 Patch0: python-google-api-python-client-no-unittest2.patch BuildRequires: %{python_module google-api-core >= 1.21.0} BuildRequires: %{python_module google-auth >= 1.16.0} -BuildRequires: %{python_module google-auth-httplib2 >= 0.0.3} +BuildRequires: %{python_module google-auth-httplib2 >= 0.1.0} BuildRequires: %{python_module httplib2 >= 0.15.0} BuildRequires: %{python_module mock} BuildRequires: %{python_module oauth2client} @@ -42,7 +42,7 @@ BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-google-api-core >= 1.21.0 Requires: python-google-auth >= 1.16.0 -Requires: python-google-auth-httplib2 >= 0.0.3 +Requires: python-google-auth-httplib2 >= 0.1.0 Requires: python-httplib2 >= 0.15.0 Requires: python-six >= 1.13.0 Requires: python-uritemplate >= 3.0.0