Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package python-google-resumable-media for 
openSUSE:Factory checked in at 2022-06-10 15:57:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-google-resumable-media (Old)
 and      /work/SRC/openSUSE:Factory/.python-google-resumable-media.new.1548 
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-google-resumable-media"

Fri Jun 10 15:57:38 2022 rev:14 rq:981550 version:2.3.3

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/python-google-resumable-media/python-google-resumable-media.changes
      2022-04-08 22:46:06.538879267 +0200
+++ 
/work/SRC/openSUSE:Factory/.python-google-resumable-media.new.1548/python-google-resumable-media.changes
    2022-06-10 15:58:00.864855501 +0200
@@ -1,0 +2,9 @@
+Thu Jun  9 08:40:36 UTC 2022 - pgaj...@suse.com
+
+- version update to 2.3.3
+  * retry client side requests timeout (#319) (d0649c7)
+- added patches
+  
https://github.com/googleapis/google-resumable-media-python/commit/82f9769f3368404d1854dd22eeed34eeb25ea835
+  + python-google-resumable-media-no-mock.patch
+
+-------------------------------------------------------------------

Old:
----
  google-resumable-media-2.3.2.tar.gz

New:
----
  google-resumable-media-2.3.3.tar.gz
  python-google-resumable-media-no-mock.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-google-resumable-media.spec ++++++
--- /var/tmp/diff_new_pack.o9x15e/_old  2022-06-10 15:58:01.348856089 +0200
+++ /var/tmp/diff_new_pack.o9x15e/_new  2022-06-10 15:58:01.356856098 +0200
@@ -19,16 +19,17 @@
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 %define skip_python2 1
 Name:           python-google-resumable-media
-Version:        2.3.2
+Version:        2.3.3
 Release:        0
 Summary:        Utilities for Google Media Downloads and Resumable Uploads
 License:        Apache-2.0
 Group:          Development/Languages/Python
 URL:            https://github.com/googleapis/google-resumable-media-python
 Source:         
https://files.pythonhosted.org/packages/source/g/google-resumable-media/google-resumable-media-%{version}.tar.gz
+# 
https://github.com/googleapis/google-resumable-media-python/commit/82f9769f3368404d1854dd22eeed34eeb25ea835
+Patch0:         python-google-resumable-media-no-mock.patch
 BuildRequires:  %{python_module google-auth}
 BuildRequires:  %{python_module google-crc32c}
-BuildRequires:  %{python_module mock}
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module requests >= 2.18.0}
@@ -47,6 +48,7 @@
 
 %prep
 %setup -q -n google-resumable-media-%{version}
+%patch0 -p1
 
 %build
 %pyproject_wheel

++++++ google-resumable-media-2.3.2.tar.gz -> 
google-resumable-media-2.3.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/google-resumable-media-2.3.2/PKG-INFO 
new/google-resumable-media-2.3.3/PKG-INFO
--- old/google-resumable-media-2.3.2/PKG-INFO   2022-03-08 21:54:01.657518000 
+0100
+++ new/google-resumable-media-2.3.3/PKG-INFO   2022-05-19 14:44:35.157641600 
+0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-resumable-media
-Version: 2.3.2
+Version: 2.3.3
 Summary: Utilities for Google Media Downloads and Resumable Uploads
 Home-page: https://github.com/googleapis/google-resumable-media-python
 Author: Google Cloud Platform
@@ -57,5 +57,3 @@
 Apache 2.0 - See `the LICENSE`_ for more information.
 
 .. _the LICENSE: 
https://github.com/googleapis/google-resumable-media-python/blob/main/LICENSE
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/google-resumable-media-2.3.2/google/resumable_media/requests/_request_helpers.py
 
new/google-resumable-media-2.3.3/google/resumable_media/requests/_request_helpers.py
--- 
old/google-resumable-media-2.3.2/google/resumable_media/requests/_request_helpers.py
        2022-03-08 21:51:16.000000000 +0100
+++ 
new/google-resumable-media-2.3.3/google/resumable_media/requests/_request_helpers.py
        2022-05-19 14:42:00.000000000 +0200
@@ -37,6 +37,7 @@
 _CONNECTION_ERROR_CLASSES = (
     requests.exceptions.ConnectionError,
     requests.exceptions.ChunkedEncodingError,
+    requests.exceptions.Timeout,
     urllib3.exceptions.ProtocolError,
     ConnectionError,  # Python 3.x only, superclass of ConnectionResetError.
 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/google-resumable-media-2.3.2/google_resumable_media.egg-info/PKG-INFO 
new/google-resumable-media-2.3.3/google_resumable_media.egg-info/PKG-INFO
--- old/google-resumable-media-2.3.2/google_resumable_media.egg-info/PKG-INFO   
2022-03-08 21:54:01.000000000 +0100
+++ new/google-resumable-media-2.3.3/google_resumable_media.egg-info/PKG-INFO   
2022-05-19 14:44:34.000000000 +0200
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: google-resumable-media
-Version: 2.3.2
+Version: 2.3.3
 Summary: Utilities for Google Media Downloads and Resumable Uploads
 Home-page: https://github.com/googleapis/google-resumable-media-python
 Author: Google Cloud Platform
@@ -57,5 +57,3 @@
 Apache 2.0 - See `the LICENSE`_ for more information.
 
 .. _the LICENSE: 
https://github.com/googleapis/google-resumable-media-python/blob/main/LICENSE
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/google-resumable-media-2.3.2/setup.py 
new/google-resumable-media-2.3.3/setup.py
--- old/google-resumable-media-2.3.2/setup.py   2022-03-08 21:51:16.000000000 
+0100
+++ new/google-resumable-media-2.3.3/setup.py   2022-05-19 14:42:00.000000000 
+0200
@@ -35,7 +35,7 @@
 
 setuptools.setup(
     name='google-resumable-media',
-    version = "2.3.2",
+    version = "2.3.3",
     description='Utilities for Google Media Downloads and Resumable Uploads',
     author='Google Cloud Platform',
     author_email='googleapis-publis...@google.com',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/google-resumable-media-2.3.2/tests/unit/requests/test__helpers.py 
new/google-resumable-media-2.3.3/tests/unit/requests/test__helpers.py
--- old/google-resumable-media-2.3.2/tests/unit/requests/test__helpers.py       
2022-03-08 21:51:16.000000000 +0100
+++ new/google-resumable-media-2.3.3/tests/unit/requests/test__helpers.py       
2022-05-19 14:42:00.000000000 +0200
@@ -195,18 +195,50 @@
         sleep_mock.assert_any_call(2.625)
         sleep_mock.assert_any_call(4.375)
 
-    @mock.patch(u"time.sleep")
-    @mock.patch(u"random.randint")
+    @mock.patch("time.sleep")
+    @mock.patch("random.randint")
     def test_success_with_retry_chunked_encoding_error(self, randint_mock, 
sleep_mock):
         randint_mock.side_effect = [125, 625, 375]
 
-        response = _make_response(http.client.NOT_FOUND)
+        status_code = int(http.client.OK)
+        response = _make_response(status_code)
         responses = [
             requests.exceptions.ChunkedEncodingError,
             requests.exceptions.ChunkedEncodingError,
             response,
         ]
         func = mock.Mock(side_effect=responses, spec=[])
+
+        retry_strategy = common.RetryStrategy()
+        ret_val = _request_helpers.wait_and_retry(
+            func, _get_status_code, retry_strategy
+        )
+
+        assert ret_val == responses[-1]
+
+        assert func.call_count == 3
+        assert func.mock_calls == [mock.call()] * 3
+
+        assert randint_mock.call_count == 2
+        assert randint_mock.mock_calls == [mock.call(0, 1000)] * 2
+
+        assert sleep_mock.call_count == 2
+        sleep_mock.assert_any_call(1.125)
+        sleep_mock.assert_any_call(2.625)
+
+    @mock.patch("time.sleep")
+    @mock.patch("random.randint")
+    def test_success_with_retry_client_timeout(self, randint_mock, sleep_mock):
+        randint_mock.side_effect = [125, 625, 375]
+
+        status_code = int(http.client.OK)
+        response = _make_response(status_code)
+        responses = [
+            requests.exceptions.Timeout,
+            requests.exceptions.Timeout,
+            response,
+        ]
+        func = mock.Mock(side_effect=responses, spec=[])
 
         retry_strategy = common.RetryStrategy()
         ret_val = _request_helpers.wait_and_retry(

++++++ python-google-resumable-media-no-mock.patch ++++++
diff --git a/tests/system/requests/test_upload.py 
b/tests/system/requests/test_upload.py
index 3dc92077..6f6991e8 100644
--- a/tests/system/requests/test_upload.py
+++ b/tests/system/requests/test_upload.py
@@ -20,7 +20,7 @@
 import urllib.parse
 
 import pytest  # type: ignore
-import mock
+from unittest import mock
 
 from google.resumable_media import common
 from google import resumable_media
diff --git a/tests/unit/requests/test__helpers.py 
b/tests/unit/requests/test__helpers.py
index 0d4c7d17..dc940f2c 100644
--- a/tests/unit/requests/test__helpers.py
+++ b/tests/unit/requests/test__helpers.py
@@ -14,7 +14,7 @@
 
 import http.client
 
-import mock
+from unittest import mock
 import pytest  # type: ignore
 
 import requests.exceptions
diff --git a/tests/unit/requests/test_download.py 
b/tests/unit/requests/test_download.py
index 210973d7..ace0df7c 100644
--- a/tests/unit/requests/test_download.py
+++ b/tests/unit/requests/test_download.py
@@ -15,7 +15,7 @@
 import http.client
 import io
 
-import mock
+from unittest import mock
 import pytest  # type: ignore
 
 from google.resumable_media import common
diff --git a/tests/unit/requests/test_upload.py 
b/tests/unit/requests/test_upload.py
index 3694c750..231bec85 100644
--- a/tests/unit/requests/test_upload.py
+++ b/tests/unit/requests/test_upload.py
@@ -16,7 +16,7 @@
 import io
 import json
 
-import mock
+from unittest import mock
 
 import google.resumable_media.requests.upload as upload_mod
 
diff --git a/tests/unit/test__download.py b/tests/unit/test__download.py
index 46026b16..21a232eb 100644
--- a/tests/unit/test__download.py
+++ b/tests/unit/test__download.py
@@ -15,7 +15,7 @@
 import http.client
 import io
 
-import mock
+from unittest import mock
 import pytest  # type: ignore
 
 from google.resumable_media import _download
diff --git a/tests/unit/test__helpers.py b/tests/unit/test__helpers.py
index feedeb18..0bfbae42 100644
--- a/tests/unit/test__helpers.py
+++ b/tests/unit/test__helpers.py
@@ -17,7 +17,7 @@
 import hashlib
 import http.client
 
-import mock
+from unittest import mock
 import pytest  # type: ignore
 
 from google.resumable_media import _helpers
diff --git a/tests/unit/test__upload.py b/tests/unit/test__upload.py
index d5f82089..110ed775 100644
--- a/tests/unit/test__upload.py
+++ b/tests/unit/test__upload.py
@@ -16,7 +16,7 @@
 import io
 import sys
 
-import mock
+from unittest import mock
 import pytest  # type: ignore
 
 from google.resumable_media import _helpers
diff --git a/tests/unit/test_common.py b/tests/unit/test_common.py
index a8572bea..d96840c1 100644
--- a/tests/unit/test_common.py
+++ b/tests/unit/test_common.py
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mock
+from unittest import mock
 import pytest  # type: ignore
 
 from google.resumable_media import common

Reply via email to