Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-s3transfer for
openSUSE:Factory checked in at 2023-07-04 15:21:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-s3transfer (Old)
and /work/SRC/openSUSE:Factory/.python-s3transfer.new.23466 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-s3transfer"
Tue Jul 4 15:21:51 2023 rev:24 rq:1096582 version:0.6.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-s3transfer/python-s3transfer.changes
2023-06-04 00:11:53.141276881 +0200
+++
/work/SRC/openSUSE:Factory/.python-s3transfer.new.23466/python-s3transfer.changes
2023-07-04 15:22:04.054092996 +0200
@@ -1,0 +2,7 @@
+Mon Jul 3 13:44:35 UTC 2023 - John Paul Adrian Glaubitz
<adrian.glaub...@suse.com>
+
+- Update to 0.6.1
+ * bugfix:copy: Added support for ``ChecksumAlgorithm``
+ when uploading copy data in parts
+
+-------------------------------------------------------------------
Old:
----
s3transfer-0.6.0.tar.gz
New:
----
s3transfer-0.6.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-s3transfer.spec ++++++
--- /var/tmp/diff_new_pack.2CeGHE/_old 2023-07-04 15:22:06.698108885 +0200
+++ /var/tmp/diff_new_pack.2CeGHE/_new 2023-07-04 15:22:06.702108909 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-s3transfer
-Version: 0.6.0
+Version: 0.6.1
Release: 0
Summary: Python S3 transfer manager
License: Apache-2.0
++++++ s3transfer-0.6.0.tar.gz -> s3transfer-0.6.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/PKG-INFO
new/s3transfer-0.6.1/PKG-INFO
--- old/s3transfer-0.6.0/PKG-INFO 2022-05-31 20:37:19.371464700 +0200
+++ new/s3transfer-0.6.1/PKG-INFO 2023-05-04 21:39:46.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: s3transfer
-Version: 0.6.0
+Version: 0.6.1
Summary: An Amazon S3 Transfer Manager
Home-page: https://github.com/boto/s3transfer
Author: Amazon Web Services
@@ -17,6 +17,7 @@
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
Requires-Python: >= 3.7
Provides-Extra: crt
License-File: LICENSE.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/s3transfer/__init__.py
new/s3transfer-0.6.1/s3transfer/__init__.py
--- old/s3transfer-0.6.0/s3transfer/__init__.py 2022-05-31 20:37:19.000000000
+0200
+++ new/s3transfer-0.6.1/s3transfer/__init__.py 2023-05-04 21:39:46.000000000
+0200
@@ -144,7 +144,7 @@
from s3transfer.exceptions import RetriesExceededError, S3UploadFailedError
__author__ = 'Amazon Web Services'
-__version__ = '0.6.0'
+__version__ = '0.6.1'
class NullHandler(logging.Handler):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/s3transfer/copies.py
new/s3transfer-0.6.1/s3transfer/copies.py
--- old/s3transfer-0.6.0/s3transfer/copies.py 2022-05-31 20:34:54.000000000
+0200
+++ new/s3transfer-0.6.1/s3transfer/copies.py 2023-05-04 21:39:46.000000000
+0200
@@ -220,6 +220,8 @@
num_parts,
transfer_future.meta.size,
)
+ # Get the checksum algorithm of the multipart request.
+ checksum_algorithm = call_args.extra_args.get("ChecksumAlgorithm")
part_futures.append(
self._transfer_coordinator.submit(
request_executor,
@@ -234,6 +236,7 @@
'extra_args': extra_part_args,
'callbacks': progress_callbacks,
'size': size,
+ 'checksum_algorithm': checksum_algorithm,
},
pending_main_kwargs={
'upload_id': create_multipart_future
@@ -331,6 +334,7 @@
extra_args,
callbacks,
size,
+ checksum_algorithm=None,
):
"""
:param client: The client to use when calling PutObject
@@ -345,6 +349,8 @@
:param callbacks: List of callbacks to call after copy part
:param size: The size of the transfer. This value is passed into
the callbacks
+ :param checksum_algorithm: The algorithm that was used to create the
multipart
+ upload
:rtype: dict
:returns: A dictionary representing a part::
@@ -352,7 +358,8 @@
{'Etag': etag_value, 'PartNumber': part_number}
This value can be appended to a list to be used to complete
- the multipart upload.
+ the multipart upload. If a checksum is in the response,
+ it will also be included.
"""
response = client.upload_part_copy(
CopySource=copy_source,
@@ -360,9 +367,16 @@
Key=key,
UploadId=upload_id,
PartNumber=part_number,
- **extra_args
+ **extra_args,
)
for callback in callbacks:
callback(bytes_transferred=size)
etag = response['CopyPartResult']['ETag']
- return {'ETag': etag, 'PartNumber': part_number}
+ part_metadata = {'ETag': etag, 'PartNumber': part_number}
+ if checksum_algorithm:
+ checksum_member = f'Checksum{checksum_algorithm.upper()}'
+ if checksum_member in response['CopyPartResult']:
+ part_metadata[checksum_member] = response['CopyPartResult'][
+ checksum_member
+ ]
+ return part_metadata
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/s3transfer.egg-info/PKG-INFO
new/s3transfer-0.6.1/s3transfer.egg-info/PKG-INFO
--- old/s3transfer-0.6.0/s3transfer.egg-info/PKG-INFO 2022-05-31
20:37:19.000000000 +0200
+++ new/s3transfer-0.6.1/s3transfer.egg-info/PKG-INFO 2023-05-04
21:39:46.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: s3transfer
-Version: 0.6.0
+Version: 0.6.1
Summary: An Amazon S3 Transfer Manager
Home-page: https://github.com/boto/s3transfer
Author: Amazon Web Services
@@ -17,6 +17,7 @@
Classifier: Programming Language :: Python :: 3.8
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
Requires-Python: >= 3.7
Provides-Extra: crt
License-File: LICENSE.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/setup.py
new/s3transfer-0.6.1/setup.py
--- old/s3transfer-0.6.0/setup.py 2022-05-31 20:37:19.000000000 +0200
+++ new/s3transfer-0.6.1/setup.py 2023-05-04 21:39:46.000000000 +0200
@@ -45,5 +45,6 @@
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
+ 'Programming Language :: Python :: 3.11',
],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/tests/functional/test_copy.py
new/s3transfer-0.6.1/tests/functional/test_copy.py
--- old/s3transfer-0.6.0/tests/functional/test_copy.py 2022-05-31
20:34:54.000000000 +0200
+++ new/s3transfer-0.6.1/tests/functional/test_copy.py 2023-05-04
21:39:46.000000000 +0200
@@ -200,6 +200,29 @@
future.result()
self.stubber.assert_no_pending_responses()
+ def test_copy_with_checksum(self):
+ self.extra_args['ChecksumAlgorithm'] = 'crc32'
+ expected_head_params = {
+ 'Bucket': 'mysourcebucket',
+ 'Key': 'mysourcekey',
+ }
+ expected_copy_object = {
+ 'Bucket': self.bucket,
+ 'Key': self.key,
+ 'CopySource': self.copy_source,
+ 'ChecksumAlgorithm': 'crc32',
+ }
+ self.add_head_object_response(expected_params=expected_head_params)
+ self.add_successful_copy_responses(
+ expected_copy_params=expected_copy_object
+ )
+
+ call_kwargs = self.create_call_kwargs()
+ call_kwargs['extra_args'] = self.extra_args
+ future = self.manager.copy(**call_kwargs)
+ future.result()
+ self.stubber.assert_no_pending_responses()
+
def test_copy_with_extra_args(self):
self.extra_args['MetadataDirective'] = 'REPLACE'
@@ -302,6 +325,7 @@
multipart_chunksize=4,
)
self._manager = TransferManager(self.client, self.config)
+ self.multipart_id = 'my-upload-id'
def create_stubbed_responses(self):
return [
@@ -311,7 +335,7 @@
},
{
'method': 'create_multipart_upload',
- 'service_response': {'UploadId': 'my-upload-id'},
+ 'service_response': {'UploadId': self.multipart_id},
},
{
'method': 'upload_part_copy',
@@ -328,6 +352,84 @@
{'method': 'complete_multipart_upload', 'service_response': {}},
]
+ def add_get_head_response_with_default_expected_params(
+ self, extra_expected_params=None
+ ):
+ expected_params = {
+ 'Bucket': 'mysourcebucket',
+ 'Key': 'mysourcekey',
+ }
+ if extra_expected_params:
+ expected_params.update(extra_expected_params)
+ response = self.create_stubbed_responses()[0]
+ response['expected_params'] = expected_params
+ self.stubber.add_response(**response)
+
+ def add_create_multipart_response_with_default_expected_params(
+ self, extra_expected_params=None
+ ):
+ expected_params = {'Bucket': self.bucket, 'Key': self.key}
+ if extra_expected_params:
+ expected_params.update(extra_expected_params)
+ response = self.create_stubbed_responses()[1]
+ response['expected_params'] = expected_params
+ self.stubber.add_response(**response)
+
+ def add_upload_part_copy_responses_with_default_expected_params(
+ self, extra_expected_params=None
+ ):
+ ranges = [
+ 'bytes=0-5242879',
+ 'bytes=5242880-10485759',
+ 'bytes=10485760-13107199',
+ ]
+ upload_part_responses = self.create_stubbed_responses()[2:-1]
+ for i, range_val in enumerate(ranges):
+ upload_part_response = upload_part_responses[i]
+ expected_params = {
+ 'Bucket': self.bucket,
+ 'Key': self.key,
+ 'CopySource': self.copy_source,
+ 'UploadId': self.multipart_id,
+ 'PartNumber': i + 1,
+ 'CopySourceRange': range_val,
+ }
+ if extra_expected_params:
+ if 'ChecksumAlgorithm' in extra_expected_params:
+ name = extra_expected_params['ChecksumAlgorithm']
+ checksum_member = 'Checksum%s' % name.upper()
+ response = upload_part_response['service_response']
+ response['CopyPartResult'][checksum_member] = 'sum%s==' % (
+ i + 1
+ )
+ else:
+ expected_params.update(extra_expected_params)
+
+ upload_part_response['expected_params'] = expected_params
+ self.stubber.add_response(**upload_part_response)
+
+ def add_complete_multipart_response_with_default_expected_params(
+ self, extra_expected_params=None
+ ):
+ expected_params = {
+ 'Bucket': self.bucket,
+ 'Key': self.key,
+ 'UploadId': self.multipart_id,
+ 'MultipartUpload': {
+ 'Parts': [
+ {'ETag': 'etag-1', 'PartNumber': 1},
+ {'ETag': 'etag-2', 'PartNumber': 2},
+ {'ETag': 'etag-3', 'PartNumber': 3},
+ ]
+ },
+ }
+ if extra_expected_params:
+ expected_params.update(extra_expected_params)
+
+ response = self.create_stubbed_responses()[-1]
+ response['expected_params'] = expected_params
+ self.stubber.add_response(**response)
+
def create_expected_progress_callback_info(self):
# Note that last read is from the empty sentinel indicating
# that the stream is done.
@@ -341,8 +443,6 @@
self.stubber.add_response(**self.create_stubbed_responses()[1])
def _get_expected_params(self):
- upload_id = 'my-upload-id'
-
# Add expected parameters to the head object
expected_head_params = {
'Bucket': 'mysourcebucket',
@@ -368,7 +468,7 @@
'Bucket': self.bucket,
'Key': self.key,
'CopySource': self.copy_source,
- 'UploadId': upload_id,
+ 'UploadId': self.multipart_id,
'PartNumber': i + 1,
'CopySourceRange': range_val,
}
@@ -378,7 +478,7 @@
expected_complete_mpu_params = {
'Bucket': self.bucket,
'Key': self.key,
- 'UploadId': upload_id,
+ 'UploadId': self.multipart_id,
'MultipartUpload': {
'Parts': [
{'ETag': 'etag-1', 'PartNumber': 1},
@@ -441,6 +541,54 @@
future.result()
self.stubber.assert_no_pending_responses()
+ def test_copy_passes_checksums(self):
+ # This extra argument should be added to the head object,
+ # the create multipart upload, and upload part copy.
+ self.extra_args['ChecksumAlgorithm'] = 'sha256'
+
+ self.add_get_head_response_with_default_expected_params()
+
+ # ChecksumAlgorithm should be passed on the create_multipart call
+ self.add_create_multipart_response_with_default_expected_params(
+ self.extra_args,
+ )
+
+ # ChecksumAlgorithm should be passed to the upload_part_copy calls
+ self.add_upload_part_copy_responses_with_default_expected_params(
+ self.extra_args,
+ )
+
+ # The checksums should be used in the complete call like etags
+ self.add_complete_multipart_response_with_default_expected_params(
+ extra_expected_params={
+ 'MultipartUpload': {
+ 'Parts': [
+ {
+ 'ETag': 'etag-1',
+ 'PartNumber': 1,
+ 'ChecksumSHA256': 'sum1==',
+ },
+ {
+ 'ETag': 'etag-2',
+ 'PartNumber': 2,
+ 'ChecksumSHA256': 'sum2==',
+ },
+ {
+ 'ETag': 'etag-3',
+ 'PartNumber': 3,
+ 'ChecksumSHA256': 'sum3==',
+ },
+ ]
+ }
+ }
+ )
+
+ call_kwargs = self.create_call_kwargs()
+ call_kwargs['extra_args'] = self.extra_args
+ future = self.manager.copy(**call_kwargs)
+ future.result()
+ self.stubber.assert_no_pending_responses()
+
def test_copy_blacklists_args_to_create_multipart(self):
# This argument can never be used for multipart uploads
self.extra_args['MetadataDirective'] = 'COPY'
@@ -528,7 +676,7 @@
expected_params={
'Bucket': self.bucket,
'Key': self.key,
- 'UploadId': 'my-upload-id',
+ 'UploadId': self.multipart_id,
},
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/tests/integration/__init__.py
new/s3transfer-0.6.1/tests/integration/__init__.py
--- old/s3transfer-0.6.0/tests/integration/__init__.py 2022-05-31
20:34:54.000000000 +0200
+++ new/s3transfer-0.6.1/tests/integration/__init__.py 2023-05-04
21:39:46.000000000 +0200
@@ -59,7 +59,9 @@
cls.client.create_bucket(
Bucket=cls.bucket_name,
CreateBucketConfiguration={'LocationConstraint': cls.region},
+ ObjectOwnership='ObjectWriter',
)
+ cls.client.delete_public_access_block(Bucket=cls.bucket_name)
def setUp(self):
self.files = FileCreator()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/s3transfer-0.6.0/tests/unit/test_copies.py
new/s3transfer-0.6.1/tests/unit/test_copies.py
--- old/s3transfer-0.6.0/tests/unit/test_copies.py 2022-05-31
20:34:54.000000000 +0200
+++ new/s3transfer-0.6.1/tests/unit/test_copies.py 2023-05-04
21:39:46.000000000 +0200
@@ -98,6 +98,7 @@
self.upload_id = 'myuploadid'
self.part_number = 1
self.result_etag = 'my-etag'
+ self.checksum_sha1 = 'my-checksum_sha1'
def get_copy_task(self, **kwargs):
default_kwargs = {
@@ -133,6 +134,35 @@
)
self.stubber.assert_no_pending_responses()
+ def test_main_with_checksum(self):
+ self.stubber.add_response(
+ 'upload_part_copy',
+ service_response={
+ 'CopyPartResult': {
+ 'ETag': self.result_etag,
+ 'ChecksumSHA1': self.checksum_sha1,
+ }
+ },
+ expected_params={
+ 'Bucket': self.bucket,
+ 'Key': self.key,
+ 'CopySource': self.copy_source,
+ 'UploadId': self.upload_id,
+ 'PartNumber': self.part_number,
+ 'CopySourceRange': self.copy_source_range,
+ },
+ )
+ task = self.get_copy_task(checksum_algorithm="sha1")
+ self.assertEqual(
+ task(),
+ {
+ 'PartNumber': self.part_number,
+ 'ETag': self.result_etag,
+ 'ChecksumSHA1': self.checksum_sha1,
+ },
+ )
+ self.stubber.assert_no_pending_responses()
+
def test_extra_args(self):
self.extra_args['RequestPayer'] = 'requester'
self.stubber.add_response(
