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

_multibuild

@@ -0,0 +1,3 @@
+<multibuild>
+  <package>test</package>
+</multibuild>

demock.patch

@@ -1,194 +1,165 @@
----
- tests/system/test_blob.py       |    2 +-
- tests/unit/test__helpers.py     |    5 +----
- tests/unit/test__http.py        |    3 +--
- tests/unit/test__signing.py     |    2 +-
- tests/unit/test_acl.py          |    3 +--
- tests/unit/test_batch.py        |    2 +-
- tests/unit/test_blob.py         |    2 +-
- tests/unit/test_bucket.py       |    2 +-
- tests/unit/test_client.py       |    4 ++--
- tests/unit/test_fileio.py       |    2 +-
- tests/unit/test_hmac_key.py     |    3 +--
- tests/unit/test_notification.py |    3 +--
- tests/unit/test_retry.py        |    3 +--
- 13 files changed, 14 insertions(+), 22 deletions(-)
-
---- a/tests/system/test_blob.py
-+++ b/tests/system/test_blob.py
-@@ -18,9 +18,9 @@ import io
- import os
- import tempfile
+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
-+from unittest import mock
  
  import pytest
 -import mock
++from unittest import mock
  
  from google import resumable_media
  from google.api_core import exceptions
---- a/tests/unit/test__helpers.py
-+++ b/tests/unit/test__helpers.py
-@@ -13,8 +13,7 @@
- # limitations under the License.
+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
- from google.cloud.storage.retry import DEFAULT_RETRY_IF_METAGENERATION_SPECIFIED
-@@ -556,8 +555,6 @@ class Test__base64_md5hash(unittest.Test
-         self.assertEqual(SIGNED_CONTENT, b"kBiQqOnIz21aGlQrIp/r/w==")
- 
-     def test_it_with_stubs(self):
--        import mock
--
-         class _Buffer(object):
-             def __init__(self, return_vals):
-                 self.return_vals = return_vals
---- a/tests/unit/test__http.py
-+++ b/tests/unit/test__http.py
-@@ -16,8 +16,7 @@ import os.path
- import sys
- import unittest
- from unittest.mock import patch
--
--import mock
-+from unittest import mock
- 
- from google.cloud.storage import _helpers
- sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..', '..')))
---- a/tests/unit/test__signing.py
-+++ b/tests/unit/test__signing.py
-@@ -24,8 +24,8 @@ import sys
- import time
- import unittest
- import urllib.parse
-+from unittest import mock
- 
--import mock
- import pytest
- 
- sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..')))
---- a/tests/unit/test_acl.py
-+++ b/tests/unit/test_acl.py
-@@ -13,8 +13,7 @@
- # limitations under the License.
- 
- import unittest
--
 -import mock
 +from unittest import mock
  
  from google.cloud.storage.retry import (
      DEFAULT_RETRY,
---- a/tests/unit/test_batch.py
-+++ b/tests/unit/test_batch.py
-@@ -16,8 +16,8 @@ import http.client
- from http.client import SERVICE_UNAVAILABLE
+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
-+from unittest import mock
  
 -import mock
++from unittest import mock
  import requests
  
  
---- a/tests/unit/test_blob.py
-+++ b/tests/unit/test_blob.py
-@@ -23,9 +23,9 @@ import tempfile
- import unittest
- import http.client
+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 unittest import mock
  from urllib.parse import urlencode
  
 -import mock
++from unittest import mock
  import pytest
  
  from google.cloud.storage import _helpers
---- a/tests/unit/test_bucket.py
-+++ b/tests/unit/test_bucket.py
-@@ -14,8 +14,8 @@
- 
+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
-+from unittest import mock
  
 -import mock
++from unittest import mock
  import pytest
  
  from google.cloud.storage.retry import DEFAULT_RETRY
---- a/tests/unit/test_client.py
-+++ b/tests/unit/test_client.py
-@@ -16,8 +16,6 @@ import base64
- import http.client
+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
+ from unittest.mock import patch
 -import mock
- import os.path
++from unittest import mock
  import pytest
  import re
-@@ -25,6 +23,8 @@ import requests
- import sys
- import unittest
- import urllib
-+from unittest.mock import patch
-+from unittest import mock
- 
- from google.api_core import exceptions
- from google.auth.credentials import AnonymousCredentials
---- a/tests/unit/test_fileio.py
-+++ b/tests/unit/test_fileio.py
-@@ -17,8 +17,8 @@
- import unittest
+ 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
-+from unittest import mock
  
 -import mock
++from unittest import mock
  
  from google.api_core.exceptions import RequestRangeNotSatisfiable
  from google.cloud.storage.retry import DEFAULT_RETRY
---- a/tests/unit/test_hmac_key.py
-+++ b/tests/unit/test_hmac_key.py
-@@ -13,8 +13,7 @@
- # limitations under the License.
+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
---- a/tests/unit/test_notification.py
-+++ b/tests/unit/test_notification.py
-@@ -13,8 +13,7 @@
- # limitations under the License.
+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
  
---- a/tests/unit/test_retry.py
-+++ b/tests/unit/test_retry.py
-@@ -13,11 +13,10 @@
- # limitations under the License.
- 
- import unittest
-+from unittest import mock
+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):
-     def _call_fut(self, exc):
+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

google-cloud-storage-2.3.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4cbb0de5e17228e9c09cdc897d81eaa70e2c396f58513f79de0e824584c8f5b
-size 5483414

google-cloud-storage-2.4.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5fe26f1381b30e3cc328f46e13531ca8525458f870c1e303c616bdeb7b7f5c66
+size 5487549

no-relative-imports.patch

@@ -1,89 +0,0 @@
----
- tests/unit/test__http.py    |    3 +++
- tests/unit/test__signing.py |    5 ++++-
- tests/unit/test_blob.py     |    2 ++
- tests/unit/test_client.py   |    5 ++++-
- 4 files changed, 13 insertions(+), 2 deletions(-)
-
---- a/tests/unit/test__http.py
-+++ b/tests/unit/test__http.py
-@@ -12,12 +12,15 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
-+import os.path
-+import sys
- import unittest
- from unittest.mock import patch
- 
- import mock
- 
- from google.cloud.storage import _helpers
-+sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..', '..')))
- from tests.unit.test__helpers import GCCL_INVOCATION_TEST_CONST
- 
- 
---- a/tests/unit/test__signing.py
-+++ b/tests/unit/test__signing.py
-@@ -19,6 +19,8 @@ import binascii
- import calendar
- import datetime
- import json
-+import os.path
-+import sys
- import time
- import unittest
- import urllib.parse
-@@ -26,7 +28,8 @@ import urllib.parse
- import mock
- import pytest
- 
--from . import _read_local_json
-+sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..')))
-+from unit import _read_local_json
- 
- 
- _SERVICE_ACCOUNT_JSON = _read_local_json("url_signer_v4_test_account.json")
---- a/tests/unit/test_blob.py
-+++ b/tests/unit/test_blob.py
-@@ -18,6 +18,7 @@ import hashlib
- import io
- import json
- import os
-+import sys
- import tempfile
- import unittest
- import http.client
-@@ -35,6 +36,7 @@ from google.cloud.storage.retry import (
- )
- from google.cloud.storage.retry import DEFAULT_RETRY_IF_ETAG_IN_JSON
- from google.cloud.storage.retry import DEFAULT_RETRY_IF_GENERATION_SPECIFIED
-+sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..', '..')))
- from tests.unit.test__helpers import GCCL_INVOCATION_TEST_CONST
- 
- 
---- a/tests/unit/test_client.py
-+++ b/tests/unit/test_client.py
-@@ -18,9 +18,11 @@ import io
- import json
- from unittest.mock import patch
- import mock
-+import os.path
- import pytest
- import re
- import requests
-+import sys
- import unittest
- import urllib
- 
-@@ -33,8 +35,9 @@ from google.cloud.storage._helpers impor
- from google.cloud.storage import _helpers
- from google.cloud.storage.retry import DEFAULT_RETRY
- from google.cloud.storage.retry import DEFAULT_RETRY_IF_GENERATION_SPECIFIED
-+sys.path.insert(0, os.path.abspath(os.path.join(__file__, '..', '..', '..')))
- from tests.unit.test__helpers import GCCL_INVOCATION_TEST_CONST
--from . import _read_local_json
-+from tests.unit import _read_local_json
- 
- _SERVICE_ACCOUNT_JSON = _read_local_json("url_signer_v4_test_account.json")
- _CONFORMANCE_TESTS = _read_local_json("url_signer_v4_test_data.json")[

python-google-cloud-storage.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Thu Jun  9 10:17:20 UTC 2022 - pgajdos@suse.com
+
+- 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
+
 -------------------------------------------------------------------
 Sat Apr 23 09:49:04 UTC 2022 - Matej Cepl <mcepl@suse.com>
 

python-google-cloud-storage.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package python-google-cloud-storage
+# spec file
 #
 # Copyright (c) 2022 SUSE LLC
 #
@@ -18,28 +18,28 @@
 
 %define skip_python2 1
 
+%global flavor @BUILD_FLAVOR@%{nil}
+%if "%{flavor}" == "test"
+%define test 1
+%define pkg_suffix -test
+%bcond_without test
+%else
+%define pkg_suffix %{nil}
+%bcond_with test
+%endif
+
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-Name:           python-google-cloud-storage
-Version:        2.3.0
+Name:           python-google-cloud-storage%{pkg_suffix}
+Version:        2.4.0
 Release:        0
 Summary:        Google Cloud Storage API python client library
 License:        Apache-2.0
 URL:            https://github.com/googleapis/python-storage
 Source:         https://files.pythonhosted.org/packages/source/g/google-cloud-storage/google-cloud-storage-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM no-relative-imports.patch gh#googleapis/python-storage#772 mcepl@suse.com
-# fix relative imports
-Patch0:         no-relative-imports.patch
 # PATCH-FIX-UPSTREAM demock.patch gh#googleapis/python-storage#770 mcepl@suse.com
 # Don’t use external mock package
 Patch1:         demock.patch
-BuildRequires:  %{python_module google-api-core >= 1.31.5}
-BuildRequires:  %{python_module google-auth >= 1.25.0}
-BuildRequires:  %{python_module google-cloud-core >= 2.3.0}
-BuildRequires:  %{python_module google-resumable-media >= 2.3.2}
-BuildRequires:  %{python_module packaging}
 BuildRequires:  %{python_module pip}
-BuildRequires:  %{python_module pytest}
-BuildRequires:  %{python_module requests >= 2.18.0}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
 BuildRequires:  fdupes
@@ -51,6 +51,19 @@ Requires:       python-google-resumable-media >= 2.3.2
 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-cloud-core >= 2.3.0}
+BuildRequires:  %{python_module google-cloud-storage}
+BuildRequires:  %{python_module google-resumable-media >= 2.3.2}
+BuildRequires:  %{python_module packaging}
+BuildRequires:  %{python_module pip}
+BuildRequires:  %{python_module pytest}
+BuildRequires:  %{python_module requests >= 2.18.0}
+%endif
+# /SECTION
 %python_subpackages
 
 %description
@@ -62,22 +75,32 @@ to users via direct download. This package provides client to it.
 %prep
 %autosetup -p1 -n google-cloud-storage-%{version}
 
+%if !%{with test}
 %build
 %pyproject_wheel
+%endif
 
+%if !%{with test}
 %install
 %pyproject_install
 %python_expand %fdupes %{buildroot}%{$python_sitelib}
+%endif
 
+%if %{with test}
 %check
-export PYTEST_ADDOPTS="--import-mode=importlib"
+#export PYTEST_ADDOPTS="--import-mode=importlib"
 %pytest -k 'not network' tests/unit
+%endif
 
+%if !%{with test}
 %files %{python_files}
 %license LICENSE
 %doc README.rst
+%dir %{python_sitelib}/google
+%dir %{python_sitelib}/google/cloud
 %{python_sitelib}/google/cloud/storage
 %{python_sitelib}/google_cloud_storage-%{version}*-info
 %{python_sitelib}/google_cloud_storage-%{version}*-nspkg.pth
+%endif
 
 %changelog