Ubuntu
python-s3transfer package

Merge ~aciba/ubuntu/+source/python-s3transfer:merge-lp2061902-noble into ubuntu/+source/python-s3transfer:ubuntu/devel

  1. Git
  2. lp:~aciba/ubuntu/+source/python-s3transfer
  3. merge-lp2061902-noble
  4. Merge into ubuntu/devel
Proposed by Alberto Contreras
Status: Merged
Merge reported by: Alberto Contreras
Merged at revision: 48b855ddae56fce3684ec4f6a66a2b4cc9ae41e7
Proposed branch: ~aciba/ubuntu/+source/python-s3transfer:merge-lp2061902-noble
Merge into: ubuntu/+source/python-s3transfer:ubuntu/devel
Diff against target: 204 lines (+58/-12)
9 files modified
.changes/0.10.1.json (+7/-0)
CHANGELOG.rst (+6/-0)
debian/changelog (+21/-1)
debian/control (+6/-1)
debian/patches/0001-use-package-module.patch (+2/-4)
debian/patches/0002-no-compat-six.patch (+1/-1)
debian/rules (+5/-2)
s3transfer/__init__.py (+4/-2)
s3transfer/utils.py (+6/-1)
Reviewer Review Type Date Requested Status
Paride Legovini (community) Approve
git-ubuntu import Pending
Review via email: mp+464461@code.launchpad.net

This proposal supersedes a proposal from 2024-04-16.

Commit message

merge-lp2061902-noble

To post a comment you must log in.
Revision history for this message
Alberto Contreras (aciba) wrote : Posted in a previous version of this proposal

ppa: https://launchpad.net/~aciba/+archive/ubuntu/python-boto3-mir

Revision history for this message
Paride Legovini (paride) : Posted in a previous version of this proposal
review: Needs Information
Revision history for this message
Paride Legovini (paride) : Posted in a previous version of this proposal
Revision history for this message
Alberto Contreras (aciba) : Posted in a previous version of this proposal
Revision history for this message
Paride Legovini (paride) wrote :

I verified that 0.10.1 is bugfix-only.

The rest LGTM, will wait for the green light for uploading given that we don't have results from a complete autopkgtest run yet.

review: Approve
Revision history for this message
Alberto Contreras (aciba) wrote :

Adding successful local autopkgtests logs: https://drive.google.com/file/d/1Z-OTDLQeue9En7gHOrErUR9jBklf2Qk1/view?usp=sharing .

Revision history for this message
Paride Legovini (paride) wrote :

Confirmed that the PPA run is good, and in particular:

117s autopkgtest [12:13:19]: @@@@@@@@@@@@@@@@@@@@ summary
117s pybuild-autopkgtest PASS

Uploaded:

Uploading python-s3transfer_0.10.1-1ubuntu1.dsc
Uploading python-s3transfer_0.10.1-1ubuntu1.debian.tar.xz
Uploading python-s3transfer_0.10.1-1ubuntu1_source.buildinfo
Uploading python-s3transfer_0.10.1-1ubuntu1_source.changes

review: Approve
Revision history for this message
Alberto Contreras (aciba) wrote :

This MR was partially merged. https://code.launchpad.net/~aciba/ubuntu/+source/python-s3transfer/+git/python-s3transfer/+merge/464531 completes the leftovers. Manually setting it as merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.changes/0.10.1.json b/.changes/0.10.1.json
0new file mode 1006440new file mode 100644
index 0000000..89c98e4
--- /dev/null
+++ b/.changes/0.10.1.json
@@ -0,0 +1,7 @@
1[
2 {
3 "category": "``urllib3``",
4 "description": "Fixed retry handling for IncompleteRead exception raised by urllib3 2.x during data transfer",
5 "type": "bugfix"
6 }
7]
0\ No newline at end of file8\ No newline at end of file
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index c168614..07d09a8 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,12 @@
2CHANGELOG2CHANGELOG
3=========3=========
44
50.10.1
6======
7
8* bugfix:``urllib3``: Fixed retry handling for IncompleteRead exception raised by urllib3 2.x during data transfer
9
10
50.10.0110.10.0
6======12======
713
diff --git a/debian/changelog b/debian/changelog
index 83f9453..c33f747 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,27 @@
1python-s3transfer (0.10.1-1ubuntu1) noble; urgency=medium
2
3 * d/control: add python3-pytest as build dependency and
4 disable tests that require internet
5 * d/rules: enable unit tests during build
6 * d/control: switch from autopkgtest-pkg-python to
7 autopkgtest-pkg-pybuild to reuse build test configuration
8 * d/control: Add upstream warning from README.md
9
10 -- Alberto Contreras <alberto.contreras@canonical.com> Tue, 16 Apr 2024 22:32:37 +0200
11
12python-s3transfer (0.10.1-1) unstable; urgency=medium
13
14 * Team upload.
15 * New upstream version
16 * Testsuite: autopkgtest-pkg-python (routine-update)
17 * refresh patches
18
19 -- Alexandre Detiste <tchet@debian.org> Fri, 29 Mar 2024 09:32:27 +0100
20
1python-s3transfer (0.10.0-1) unstable; urgency=medium21python-s3transfer (0.10.0-1) unstable; urgency=medium
222
3 * Team Upload23 * Team Upload
4 * New upstream version 0.10.024 * New upstream version 0.10.0 (Closes: #1060760)
5 * depends on new python3-botocore (>= 1.34.18+repack-1~)25 * depends on new python3-botocore (>= 1.34.18+repack-1~)
6 * do not impored vendored six.py from botocore.compat26 * do not impored vendored six.py from botocore.compat
7 * use new dh-sequence-python327 * use new dh-sequence-python3
diff --git a/debian/control b/debian/control
index 9c1d101..f2891ec 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,16 @@
1Source: python-s3transfer1Source: python-s3transfer
2Section: python2Section: python
3Testsuite: autopkgtest-pkg-pybuild
3Priority: optional4Priority: optional
4Maintainer: Debian Python Team <team+python@tracker.debian.org>5Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
6XSBC-Original-Maintainer: Debian Python Team <team+python@tracker.debian.org>
5Uploaders: TANIGUCHI Takaki <takaki@debian.org>7Uploaders: TANIGUCHI Takaki <takaki@debian.org>
6Build-Depends: debhelper-compat (= 13)8Build-Depends: debhelper-compat (= 13)
7 , python3-all9 , python3-all
8 , python3-setuptools10 , python3-setuptools
9 , dh-sequence-python311 , dh-sequence-python3
10 , python3-botocore (>= 1.34.18+repack-1~)12 , python3-botocore (>= 1.34.18+repack-1~)
13 , python3-pytest
11Rules-Requires-Root: no14Rules-Requires-Root: no
12Standards-Version: 4.6.215Standards-Version: 4.6.2
13Homepage: https://github.com/boto/s3transfer16Homepage: https://github.com/boto/s3transfer
@@ -21,3 +24,5 @@ Description: Amazon S3 Transfer Manager for Python3
21 S3transfer is a Python library for managing Amazon S3 transfers.24 S3transfer is a Python library for managing Amazon S3 transfers.
22 .25 .
23 This package contains the module for Python 3.26 This package contains the module for Python 3.
27 This project is not currently GA. For a basic, stable interface of s3transfer,
28 try the interfaces exposed in python-boto3.
diff --git a/debian/patches/0001-use-package-module.patch b/debian/patches/0001-use-package-module.patch
index d892e30..e803b0d 100644
--- a/debian/patches/0001-use-package-module.patch
+++ b/debian/patches/0001-use-package-module.patch
@@ -6,14 +6,12 @@ Subject: use package module
6 s3transfer/__init__.py | 2 +-6 s3transfer/__init__.py | 2 +-
7 1 file changed, 1 insertion(+), 1 deletion(-)7 1 file changed, 1 insertion(+), 1 deletion(-)
88
9diff --git a/s3transfer/__init__.py b/s3transfer/__init__.py
10index c6760f8..a53bfe0 100644
11--- a/s3transfer/__init__.py9--- a/s3transfer/__init__.py
12+++ b/s3transfer/__init__.py10+++ b/s3transfer/__init__.py
13@@ -136,7 +136,7 @@ import threading11@@ -136,7 +136,7 @@
14 12
15 from botocore.compat import six # noqa: F40113 from botocore.compat import six # noqa: F401
16 from botocore.exceptions import IncompleteReadError14 from botocore.exceptions import IncompleteReadError, ResponseStreamingError
17-from botocore.vendored.requests.packages.urllib3.exceptions import (15-from botocore.vendored.requests.packages.urllib3.exceptions import (
18+from urllib3.exceptions import (16+from urllib3.exceptions import (
19 ReadTimeoutError,17 ReadTimeoutError,
diff --git a/debian/patches/0002-no-compat-six.patch b/debian/patches/0002-no-compat-six.patch
index ae1294a..2039656 100644
--- a/debian/patches/0002-no-compat-six.patch
+++ b/debian/patches/0002-no-compat-six.patch
@@ -18,6 +18,6 @@ Forwarded: https://github.com/boto/s3transfer/pull/300
18 import threading18 import threading
19 19
20-from botocore.compat import six # noqa: F40120-from botocore.compat import six # noqa: F401
21 from botocore.exceptions import IncompleteReadError21 from botocore.exceptions import IncompleteReadError, ResponseStreamingError
22 from urllib3.exceptions import (22 from urllib3.exceptions import (
23 ReadTimeoutError,23 ReadTimeoutError,
diff --git a/debian/rules b/debian/rules
index 79548d2..1d68bdf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,11 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
22
3export PYBUILD_NAME=s3transfer3export PYBUILD_NAME=s3transfer
4# requires network access4export PYBUILD_TEST_ARGS={dir}/tests/unit \
5export PYBUILD_DISABLE=test5 --deselect tests/unit/test_processpool.py::TestClientFactory::test_create_client \
6 --deselect tests/unit/test_processpool.py::TestClientFactory::test_user_agent_with_config \
7 --deselect tests/unit/test_processpool.py::TestClientFactory::test_user_agent_with_existing_user_agent \
8 --deselect tests/unit/test_processpool.py::TestClientFactory::test_user_agent_with_existing_user_agent_extra
69
7%:10%:
8 dh $@ --buildsystem=pybuild11 dh $@ --buildsystem=pybuild
diff --git a/s3transfer/__init__.py b/s3transfer/__init__.py
index d2a7191..4ada4a8 100644
--- a/s3transfer/__init__.py
+++ b/s3transfer/__init__.py
@@ -135,7 +135,7 @@ import string
135import threading135import threading
136136
137from botocore.compat import six # noqa: F401137from botocore.compat import six # noqa: F401
138from botocore.exceptions import IncompleteReadError138from botocore.exceptions import IncompleteReadError, ResponseStreamingError
139from botocore.vendored.requests.packages.urllib3.exceptions import (139from botocore.vendored.requests.packages.urllib3.exceptions import (
140 ReadTimeoutError,140 ReadTimeoutError,
141)141)
@@ -144,7 +144,7 @@ import s3transfer.compat
144from s3transfer.exceptions import RetriesExceededError, S3UploadFailedError144from s3transfer.exceptions import RetriesExceededError, S3UploadFailedError
145145
146__author__ = 'Amazon Web Services'146__author__ = 'Amazon Web Services'
147__version__ = '0.10.0'147__version__ = '0.10.1'
148148
149149
150class NullHandler(logging.Handler):150class NullHandler(logging.Handler):
@@ -624,6 +624,7 @@ class MultipartDownloader:
624 OSError,624 OSError,
625 ReadTimeoutError,625 ReadTimeoutError,
626 IncompleteReadError,626 IncompleteReadError,
627 ResponseStreamingError,
627 ) as e:628 ) as e:
628 logger.debug(629 logger.debug(
629 "Retrying exception caught (%s), "630 "Retrying exception caught (%s), "
@@ -840,6 +841,7 @@ class S3Transfer:
840 OSError,841 OSError,
841 ReadTimeoutError,842 ReadTimeoutError,
842 IncompleteReadError,843 IncompleteReadError,
844 ResponseStreamingError,
843 ) as e:845 ) as e:
844 # TODO: we need a way to reset the callback if the846 # TODO: we need a way to reset the callback if the
845 # download failed.847 # download failed.
diff --git a/s3transfer/utils.py b/s3transfer/utils.py
index 9954dc0..ef171f5 100644
--- a/s3transfer/utils.py
+++ b/s3transfer/utils.py
@@ -21,7 +21,11 @@ import string
21import threading21import threading
22from collections import defaultdict22from collections import defaultdict
2323
24from botocore.exceptions import IncompleteReadError, ReadTimeoutError24from botocore.exceptions import (
25 IncompleteReadError,
26 ReadTimeoutError,
27 ResponseStreamingError,
28)
25from botocore.httpchecksum import AwsChunkedWrapper29from botocore.httpchecksum import AwsChunkedWrapper
26from botocore.utils import is_s3express_bucket30from botocore.utils import is_s3express_bucket
2731
@@ -41,6 +45,7 @@ S3_RETRYABLE_DOWNLOAD_ERRORS = (
41 SOCKET_ERROR,45 SOCKET_ERROR,
42 ReadTimeoutError,46 ReadTimeoutError,
43 IncompleteReadError,47 IncompleteReadError,
48 ResponseStreamingError,
44)49)
4550
4651

Subscribers

People subscribed via source and target branches