Matej Cepl 69d449efe2 Accepting request 981478 from home:pgajdos:python
- version update to 2.4.0
  Features
    * add AbortIncompleteMultipartUpload lifecycle rule (#765) (b2e5150)
    * support OLM Prefix/Suffix (#773) (187cf50)
  Bug Fixes
    * fix rewrite object in CMEK enabled bucket (#807) (9b3cbf3)
  Documentation
    * fix changelog header to consistent size (#802) (4dd0907)
    * samples: Update the Recovery Point Objective (RPO) sample output (#725) (b0bf411)
    * Update generation_metageneration.rst with a missing space (#798) (1e7cdb6)
    * update retry docs (#808) (c365d5b)
- test in _multibuild
- modified patches
  % demock.patch (rebased)
- deleted patches
  - no-relative-imports.patch (upstreamed)
- added sources
  + _multibuild

OBS-URL: https://build.opensuse.org/request/show/981478
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-google-cloud-storage?expand=0&rev=36
2022-06-09 12:41:45 +00:00

166 lines
6.6 KiB
Diff

diff -upr google-cloud-storage-2.4.0.orig/tests/system/test_blob.py google-cloud-storage-2.4.0/tests/system/test_blob.py
--- google-cloud-storage-2.4.0.orig/tests/system/test_blob.py 2022-06-09 11:55:42.724388610 +0200
+++ google-cloud-storage-2.4.0/tests/system/test_blob.py 2022-06-09 11:55:42.776388901 +0200
@@ -20,7 +20,7 @@ import tempfile
import warnings
import pytest
-import mock
+from unittest import mock
from google import resumable_media
from google.api_core import exceptions
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_acl.py google-cloud-storage-2.4.0/tests/unit/test_acl.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_acl.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_acl.py 2022-06-09 11:55:42.780388923 +0200
@@ -14,7 +14,7 @@
import unittest
-import mock
+from unittest import mock
from google.cloud.storage.retry import (
DEFAULT_RETRY,
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_batch.py google-cloud-storage-2.4.0/tests/unit/test_batch.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_batch.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_batch.py 2022-06-09 11:55:42.780388923 +0200
@@ -17,7 +17,7 @@ from http.client import SERVICE_UNAVAILA
from http.client import NO_CONTENT
import unittest
-import mock
+from unittest import mock
import requests
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_blob.py google-cloud-storage-2.4.0/tests/unit/test_blob.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_blob.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_blob.py 2022-06-09 11:55:42.784388945 +0200
@@ -24,7 +24,7 @@ import http.client
from unittest.mock import patch
from urllib.parse import urlencode
-import mock
+from unittest import mock
import pytest
from google.cloud.storage import _helpers
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_bucket.py google-cloud-storage-2.4.0/tests/unit/test_bucket.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_bucket.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_bucket.py 2022-06-09 11:55:42.784388945 +0200
@@ -15,7 +15,7 @@
import datetime
import unittest
-import mock
+from unittest import mock
import pytest
from google.cloud.storage.retry import DEFAULT_RETRY
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_client.py google-cloud-storage-2.4.0/tests/unit/test_client.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_client.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_client.py 2022-06-09 11:55:42.784388945 +0200
@@ -17,7 +17,7 @@ import http.client
import io
import json
from unittest.mock import patch
-import mock
+from unittest import mock
import pytest
import re
import requests
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_fileio.py google-cloud-storage-2.4.0/tests/unit/test_fileio.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_fileio.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_fileio.py 2022-06-09 11:55:42.784388945 +0200
@@ -18,7 +18,7 @@ import unittest
import io
import string
-import mock
+from unittest import mock
from google.api_core.exceptions import RequestRangeNotSatisfiable
from google.cloud.storage.retry import DEFAULT_RETRY
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test__helpers.py google-cloud-storage-2.4.0/tests/unit/test__helpers.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test__helpers.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test__helpers.py 2022-06-09 11:55:42.780388923 +0200
@@ -14,7 +14,7 @@
import unittest
-import mock
+from unittest import mock
from google.cloud.storage.retry import DEFAULT_RETRY
from google.cloud.storage.retry import DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED
@@ -556,7 +556,7 @@ class Test__base64_md5hash(unittest.Test
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 -upr google-cloud-storage-2.4.0.orig/tests/unit/test_hmac_key.py google-cloud-storage-2.4.0/tests/unit/test_hmac_key.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_hmac_key.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_hmac_key.py 2022-06-09 11:55:42.788388968 +0200
@@ -14,7 +14,7 @@
import unittest
-import mock
+from unittest import mock
from google.cloud.storage.retry import DEFAULT_RETRY
from google.cloud.storage.retry import DEFAULT_RETRY_IF_ETAG_IN_JSON
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test__http.py google-cloud-storage-2.4.0/tests/unit/test__http.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test__http.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test__http.py 2022-06-09 11:55:42.780388923 +0200
@@ -15,7 +15,7 @@
import unittest
from unittest.mock import patch
-import mock
+from unittest import mock
from google.cloud.storage import _helpers
from tests.unit.test__helpers import GCCL_INVOCATION_TEST_CONST
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_notification.py google-cloud-storage-2.4.0/tests/unit/test_notification.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_notification.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_notification.py 2022-06-09 11:55:42.788388968 +0200
@@ -14,7 +14,7 @@
import unittest
-import mock
+from unittest import mock
from google.cloud.storage.retry import DEFAULT_RETRY
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test_retry.py google-cloud-storage-2.4.0/tests/unit/test_retry.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test_retry.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test_retry.py 2022-06-09 11:55:42.788388968 +0200
@@ -16,7 +16,7 @@ import unittest
from google.cloud.storage import _helpers
-import mock
+from unittest import mock
class Test_should_retry(unittest.TestCase):
diff -upr google-cloud-storage-2.4.0.orig/tests/unit/test__signing.py google-cloud-storage-2.4.0/tests/unit/test__signing.py
--- google-cloud-storage-2.4.0.orig/tests/unit/test__signing.py 2022-06-09 11:55:42.748388744 +0200
+++ google-cloud-storage-2.4.0/tests/unit/test__signing.py 2022-06-09 11:55:42.780388923 +0200
@@ -23,7 +23,7 @@ import time
import unittest
import urllib.parse
-import mock
+from unittest import mock
import pytest
from . import _read_local_json