From fcb37d9ae242e5e07d4fdf48f06b015ef5a5ea5073c102d4a5058f80949b5337 Mon Sep 17 00:00:00 2001
From: Robert Schweikert <rjschwei@suse.com>
Date: Sun, 26 Nov 2023 11:19:51 +0000
Subject: [PATCH] Accepting request 1128593 from
 home:glaubitz:branches:devel:languages:python

- Update to 2.13.0
  * Add Autoclass v2.1 support (#1117)
  * Add support for custom headers (#1121)
  * Blob.from_string parse storage uri with regex (#1170)
  * Bucket.delete(force=True) now works with version-enabled buckets (#1172)
  * Fix typo in Bucket.clear_lifecycle_rules() (#1169)
  * Fix exception field in tm reference docs (#1164)
- from version 2.12.0
  * Add additional_blob_attributes to upload_many_from_filenames (#1162)
  * Add crc32c_checksum argument to download_chunks_concurrently (#1138)
  * Add skip_if_exists to download_many (#1161)
  * Launch transfer manager to GA (#1159)
  * Bump python-auth version to fix issue and remove workaround (#1158)
  * Mark _deprecate_threads_param as a wrapper to unblock introspection and docs (#1122)
  * Add snippets for upload_chunks_concurrently and add chunk_size (#1135)
  * Update formatting and wording in transfer_manager docstrings (#1163)
- from version 2.11.0
  * Add gccl-gcs-cmd field to X-Goog-API-Client header for Transfer Manager calls (#1119)
  * Add transfer_manager.upload_chunks_concurrently using the XML MPU API (#1115)
  * Support configurable retries in upload_chunks_concurrently (#1120)
  * Split retention period tests due to caching change (#1068)
  * Add Transfer Manager documentation in c.g.c (#1109)
- Refresh patches for new version
  * demock.patch
- Update BuildRequires and Require from setup.py

OBS-URL: https://build.opensuse.org/request/show/1128593
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-cloud-storage?expand=0&rev=50
---
 demock.patch                        | 97 +++++++++++++----------------
 google-cloud-storage-2.10.0.tar.gz  |  3 -
 google-cloud-storage-2.13.0.tar.gz  |  3 +
 python-google-cloud-storage.changes | 29 +++++++++
 python-google-cloud-storage.spec    | 12 ++--
 5 files changed, 83 insertions(+), 61 deletions(-)
 delete mode 100644 google-cloud-storage-2.10.0.tar.gz
 create mode 100644 google-cloud-storage-2.13.0.tar.gz

diff --git a/demock.patch b/demock.patch
index be8572f..403f7c7 100644
--- a/demock.patch
+++ b/demock.patch
@@ -1,6 +1,6 @@
-diff -Nru google-cloud-storage-2.8.0.orig/tests/system/test_blob.py google-cloud-storage-2.8.0/tests/system/test_blob.py
---- google-cloud-storage-2.8.0.orig/tests/system/test_blob.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/system/test_blob.py	2023-03-30 12:03:21.658159496 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/system/test_blob.py google-cloud-storage-2.13.0/tests/system/test_blob.py
+--- google-cloud-storage-2.13.0.orig/tests/system/test_blob.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/system/test_blob.py	2023-11-24 14:24:31.800639129 +0100
 @@ -21,7 +21,7 @@
  import warnings
  
@@ -10,9 +10,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/system/test_blob.py google-cloud
  
  from google import resumable_media
  from google.api_core import exceptions
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_acl.py google-cloud-storage-2.8.0/tests/unit/test_acl.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_acl.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_acl.py	2023-03-30 12:03:21.714159988 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_acl.py google-cloud-storage-2.13.0/tests/unit/test_acl.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_acl.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_acl.py	2023-11-24 14:24:31.910639470 +0100
 @@ -14,7 +14,7 @@
  
  import unittest
@@ -22,9 +22,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_acl.py google-cloud-st
  
  from google.cloud.storage.retry import (
      DEFAULT_RETRY,
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_batch.py google-cloud-storage-2.8.0/tests/unit/test_batch.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_batch.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_batch.py	2023-03-30 12:03:21.706159918 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_batch.py google-cloud-storage-2.13.0/tests/unit/test_batch.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_batch.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_batch.py	2023-11-24 14:24:31.880639377 +0100
 @@ -17,7 +17,7 @@
  from http.client import NO_CONTENT
  import unittest
@@ -34,9 +34,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_batch.py google-cloud-
  import requests
  
  
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_blob.py google-cloud-storage-2.8.0/tests/unit/test_blob.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_blob.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_blob.py	2023-03-30 12:03:21.694159812 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_blob.py google-cloud-storage-2.13.0/tests/unit/test_blob.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_blob.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_blob.py	2023-11-24 14:24:31.863972659 +0100
 @@ -24,7 +24,7 @@
  from unittest.mock import patch
  from urllib.parse import urlencode
@@ -46,9 +46,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_blob.py google-cloud-s
  import pytest
  
  from google.cloud.storage import _helpers
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_bucket.py google-cloud-storage-2.8.0/tests/unit/test_bucket.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_bucket.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_bucket.py	2023-03-30 12:03:21.714159988 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_bucket.py google-cloud-storage-2.13.0/tests/unit/test_bucket.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_bucket.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_bucket.py	2023-11-24 14:24:31.903972782 +0100
 @@ -15,7 +15,7 @@
  import datetime
  import unittest
@@ -58,9 +58,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_bucket.py google-cloud
  import pytest
  
  from google.cloud.storage.retry import DEFAULT_RETRY
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_client.py google-cloud-storage-2.8.0/tests/unit/test_client.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_client.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_client.py	2023-03-30 12:03:21.706159918 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_client.py google-cloud-storage-2.13.0/tests/unit/test_client.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_client.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_client.py	2023-11-24 14:24:31.877306033 +0100
 @@ -17,7 +17,7 @@
  import io
  import json
@@ -70,9 +70,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_client.py google-cloud
  import pytest
  import re
  import requests
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_fileio.py google-cloud-storage-2.8.0/tests/unit/test_fileio.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_fileio.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_fileio.py	2023-03-30 12:03:21.702159882 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_fileio.py google-cloud-storage-2.13.0/tests/unit/test_fileio.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_fileio.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_fileio.py	2023-11-24 14:24:31.873972690 +0100
 @@ -18,7 +18,7 @@
  import io
  import string
@@ -82,9 +82,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_fileio.py google-cloud
  
  from google.api_core.exceptions import RequestRangeNotSatisfiable
  from google.cloud.storage.retry import DEFAULT_RETRY
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test__helpers.py google-cloud-storage-2.8.0/tests/unit/test__helpers.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test__helpers.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test__helpers.py	2023-03-30 12:03:21.702159882 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test__helpers.py google-cloud-storage-2.13.0/tests/unit/test__helpers.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test__helpers.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test__helpers.py	2023-11-24 14:24:31.870639346 +0100
 @@ -14,7 +14,7 @@
  
  import unittest
@@ -94,18 +94,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test__helpers.py google-clo
  
  from google.cloud.storage.retry import DEFAULT_RETRY
  from google.cloud.storage.retry import DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED
-@@ -556,7 +556,7 @@
-         self.assertEqual(SIGNED_CONTENT, b"kBiQqOnIz21aGlQrIp/r/w==")
- 
-     def test_it_with_stubs(self):
--        import mock
-+        from unittest import mock
- 
-         class _Buffer(object):
-             def __init__(self, return_vals):
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_hmac_key.py google-cloud-storage-2.8.0/tests/unit/test_hmac_key.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_hmac_key.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_hmac_key.py	2023-03-30 12:03:21.714159988 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_hmac_key.py google-cloud-storage-2.13.0/tests/unit/test_hmac_key.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_hmac_key.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_hmac_key.py	2023-11-24 14:24:31.897306095 +0100
 @@ -14,7 +14,7 @@
  
  import unittest
@@ -115,9 +106,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_hmac_key.py google-clo
  
  from google.cloud.storage.retry import DEFAULT_RETRY
  from google.cloud.storage.retry import DEFAULT_RETRY_IF_ETAG_IN_JSON
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test__http.py google-cloud-storage-2.8.0/tests/unit/test__http.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test__http.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test__http.py	2023-03-30 12:03:21.686159742 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test__http.py google-cloud-storage-2.13.0/tests/unit/test__http.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test__http.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test__http.py	2023-11-24 14:24:31.853972628 +0100
 @@ -15,7 +15,7 @@
  import unittest
  from unittest.mock import patch
@@ -126,10 +117,10 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test__http.py google-cloud-
 +from unittest import mock
  
  from google.cloud.storage import _helpers
- from tests.unit.test__helpers import GCCL_INVOCATION_TEST_CONST
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_notification.py google-cloud-storage-2.8.0/tests/unit/test_notification.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_notification.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_notification.py	2023-03-30 12:03:21.690159777 +0200
+ 
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_notification.py google-cloud-storage-2.13.0/tests/unit/test_notification.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_notification.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_notification.py	2023-11-24 14:24:31.857305971 +0100
 @@ -14,7 +14,7 @@
  
  import unittest
@@ -139,9 +130,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_notification.py google
  
  from google.cloud.storage.retry import DEFAULT_RETRY
  
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_retry.py google-cloud-storage-2.8.0/tests/unit/test_retry.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_retry.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_retry.py	2023-03-30 12:03:21.710159953 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_retry.py google-cloud-storage-2.13.0/tests/unit/test_retry.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_retry.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_retry.py	2023-11-24 14:24:31.890639408 +0100
 @@ -16,7 +16,7 @@
  
  from google.cloud.storage import _helpers
@@ -151,9 +142,9 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_retry.py google-cloud-
  
  
  class Test_should_retry(unittest.TestCase):
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test__signing.py google-cloud-storage-2.8.0/tests/unit/test__signing.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test__signing.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test__signing.py	2023-03-30 12:03:21.698159847 +0200
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test__signing.py google-cloud-storage-2.13.0/tests/unit/test__signing.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test__signing.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test__signing.py	2023-11-24 14:24:31.867306002 +0100
 @@ -23,7 +23,7 @@
  import unittest
  import urllib.parse
@@ -163,10 +154,10 @@ diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test__signing.py google-clo
  import pytest
  
  from . import _read_local_json
-diff -Nru google-cloud-storage-2.8.0.orig/tests/unit/test_transfer_manager.py google-cloud-storage-2.8.0/tests/unit/test_transfer_manager.py
---- google-cloud-storage-2.8.0.orig/tests/unit/test_transfer_manager.py	2023-03-29 23:18:24.000000000 +0200
-+++ google-cloud-storage-2.8.0/tests/unit/test_transfer_manager.py	2023-03-30 12:03:21.710159953 +0200
-@@ -23,7 +23,7 @@
+diff -Nru google-cloud-storage-2.13.0.orig/tests/unit/test_transfer_manager.py google-cloud-storage-2.13.0/tests/unit/test_transfer_manager.py
+--- google-cloud-storage-2.13.0.orig/tests/unit/test_transfer_manager.py	2023-10-31 18:39:05.000000000 +0100
++++ google-cloud-storage-2.13.0/tests/unit/test_transfer_manager.py	2023-11-24 14:24:31.883972721 +0100
+@@ -24,7 +24,7 @@
  
  import os
  import tempfile
diff --git a/google-cloud-storage-2.10.0.tar.gz b/google-cloud-storage-2.10.0.tar.gz
deleted file mode 100644
index b039e3f..0000000
--- a/google-cloud-storage-2.10.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:934b31ead5f3994e5360f9ff5750982c5b6b11604dc072bc452c25965e076dc7
-size 5504936
diff --git a/google-cloud-storage-2.13.0.tar.gz b/google-cloud-storage-2.13.0.tar.gz
new file mode 100644
index 0000000..f23e43b
--- /dev/null
+++ b/google-cloud-storage-2.13.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f62dc4c7b6cd4360d072e3deb28035fbdad491ac3d9b0b1815a12daea10f37c7
+size 5516233
diff --git a/python-google-cloud-storage.changes b/python-google-cloud-storage.changes
index d9b481b..7d40c43 100644
--- a/python-google-cloud-storage.changes
+++ b/python-google-cloud-storage.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Fri Nov 24 13:54:17 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
+
+- Update to 2.13.0
+  * Add Autoclass v2.1 support (#1117)
+  * Add support for custom headers (#1121)
+  * Blob.from_string parse storage uri with regex (#1170)
+  * Bucket.delete(force=True) now works with version-enabled buckets (#1172)
+  * Fix typo in Bucket.clear_lifecycle_rules() (#1169)
+  * Fix exception field in tm reference docs (#1164)
+- from version 2.12.0
+  * Add additional_blob_attributes to upload_many_from_filenames (#1162)
+  * Add crc32c_checksum argument to download_chunks_concurrently (#1138)
+  * Add skip_if_exists to download_many (#1161)
+  * Launch transfer manager to GA (#1159)
+  * Bump python-auth version to fix issue and remove workaround (#1158)
+  * Mark _deprecate_threads_param as a wrapper to unblock introspection and docs (#1122)
+  * Add snippets for upload_chunks_concurrently and add chunk_size (#1135)
+  * Update formatting and wording in transfer_manager docstrings (#1163)
+- from version 2.11.0
+  * Add gccl-gcs-cmd field to X-Goog-API-Client header for Transfer Manager calls (#1119)
+  * Add transfer_manager.upload_chunks_concurrently using the XML MPU API (#1115)
+  * Support configurable retries in upload_chunks_concurrently (#1120)
+  * Split retention period tests due to caching change (#1068)
+  * Add Transfer Manager documentation in c.g.c (#1109)
+- Refresh patches for new version
+  * demock.patch
+- Update BuildRequires and Require from setup.py
+
 -------------------------------------------------------------------
 Wed Jun 28 12:25:01 UTC 2023 - John Paul Adrian Glaubitz <adrian.glaubitz@suse.com>
 
diff --git a/python-google-cloud-storage.spec b/python-google-cloud-storage.spec
index 38438a4..a0bfb63 100644
--- a/python-google-cloud-storage.spec
+++ b/python-google-cloud-storage.spec
@@ -27,7 +27,7 @@
 %bcond_with test
 %endif
 Name:           python-google-cloud-storage%{pkg_suffix}
-Version:        2.10.0
+Version:        2.13.0
 Release:        0
 Summary:        Google Cloud Storage API python client library
 License:        Apache-2.0
@@ -42,19 +42,21 @@ BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
 BuildRequires:  python-rpm-macros
 Requires:       python-google-api-core >= 1.31.5
-Requires:       python-google-auth >= 1.25.0
+Requires:       python-google-auth >= 2.23.3
 Requires:       python-google-cloud-core >= 1.6.0
-Requires:       python-google-resumable-media >= 2.3.2
+Requires:       python-google-crc32c >= 1.0
+Requires:       python-google-resumable-media >= 2.6.0
 Requires:       python-googleapis-common-protos
 Requires:       python-requests >= 2.18.0
 BuildArch:      noarch
 # SECTION test requirements
 %if %{with test}
 BuildRequires:  %{python_module google-api-core >= 1.31.5}
-BuildRequires:  %{python_module google-auth >= 1.25.0}
+BuildRequires:  %{python_module google-auth >= 2.23.3}
 BuildRequires:  %{python_module google-cloud-core >= 2.3.0}
 BuildRequires:  %{python_module google-cloud-storage}
-BuildRequires:  %{python_module google-resumable-media >= 2.3.2}
+BuildRequires:  %{python_module google-crc32c >= 1.0}
+BuildRequires:  %{python_module google-resumable-media >= 2.6.0}
 BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}