Merge branch 'release-0.13.1'

aws-sdk-python-automation · aws-sdk-python-automation · commit 7ea7d921c859 · 2025-07-18T18:11:17.000Z
* release-0.13.1: Bumping version to 0.13.1 Add official Python 3.14 support with first release candidate (#353) Updates based on feedback Add ruff reformatting Update utils.py Update utils.py Create nested client method Replace bespoke NullHandler with Python's impl (#351) Update test_futures.py Format code with latest changes Update dependency versions and ruff hook Typo Fix (#349) Update test runners to test 3.14 beta build (#348) Avoid the multiprocessing forkserver method
diff --git a/.changes/0.13.1.json b/.changes/0.13.1.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "Python",
+    "description": "Added provisional support for the upcoming Python 3.14 release",
+    "type": "enhancement"
+  }
+]
diff --git a/.github/workflows/run-crt-test.yml b/.github/workflows/run-crt-test.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14-dev"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,14 +1,14 @@
 exclude: ^(.changes/|CHANGELOG.rst|s3transfer/compat.py)
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
-    rev: v4.5.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.8
+    rev: v0.12.0
     hooks:
-      - id: ruff
+      - id: ruff-check
         args: [ --fix ]
       - id: ruff-format
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+0.13.1
+======
+
+* enhancement:Python: Added provisional support for the upcoming Python 3.14 release
+
+
 0.13.0
 ======
 
diff --git a/s3transfer/__init__.py b/s3transfer/__init__.py
@@ -134,6 +134,7 @@ def __call__(self, bytes_amount):
 import socket
 import string
 import threading
+from logging import NullHandler
 
 from botocore.compat import six  # noqa: F401
 from botocore.exceptions import IncompleteReadError, ResponseStreamingError
@@ -145,12 +146,7 @@ def __call__(self, bytes_amount):
 from s3transfer.exceptions import RetriesExceededError, S3UploadFailedError
 
 __author__ = 'Amazon Web Services'
-__version__ = '0.13.0'
-
-
-class NullHandler(logging.Handler):
-    def emit(self, record):
-        pass
+__version__ = '0.13.1'
 
 
 logger = logging.getLogger(__name__)
@@ -513,7 +509,7 @@ def put(self, item):
         with self._shutdown_lock:
             if self._shutdown:
                 raise QueueShutdownError(
-                    "Cannot put item to queue when " "queue has been shutdown."
+                    "Cannot put item to queue when queue has been shutdown."
                 )
         return queue.Queue.put(self, item)
 
@@ -800,8 +796,7 @@ def download_file(
             )
         except Exception:
             logger.debug(
-                "Exception caught in download_file, removing partial "
-                "file: %s",
+                "Exception caught in download_file, removing partial file: %s",
                 temp_filename,
                 exc_info=True,
             )
diff --git a/s3transfer/crt.py b/s3transfer/crt.py
@@ -46,6 +46,7 @@
 from s3transfer.utils import (
     CallArgs,
     OSUtils,
+    create_nested_client,
     get_callbacks,
     is_s3express_bucket,
 )
@@ -481,7 +482,7 @@ def __init__(self, session, client_kwargs=None):
         if client_kwargs is None:
             client_kwargs = {}
         self._resolve_client_config(session, client_kwargs)
-        self._client = session.create_client(**client_kwargs)
+        self._client = create_nested_client(session, **client_kwargs)
         self._client.meta.events.register(
             'request-created.s3.*', self._capture_http_request
         )
diff --git a/s3transfer/manager.py b/s3transfer/manager.py
@@ -514,8 +514,9 @@ def _validate_all_known_args(self, actual, allowed):
         for kwarg in actual:
             if kwarg not in allowed:
                 raise ValueError(
-                    "Invalid extra_args key '{}', "
-                    "must be one of: {}".format(kwarg, ', '.join(allowed))
+                    "Invalid extra_args key '{}', must be one of: {}".format(
+                        kwarg, ', '.join(allowed)
+                    )
                 )
 
     def _add_operation_defaults(self, extra_args):
diff --git a/s3transfer/processpool.py b/s3transfer/processpool.py
@@ -214,6 +214,7 @@
     OSUtils,
     calculate_num_parts,
     calculate_range_parameter,
+    create_nested_client,
 )
 
 logger = logging.getLogger(__name__)
@@ -577,9 +578,8 @@ def __init__(self, client_kwargs=None):
 
     def create_client(self):
         """Create a botocore S3 client"""
-        return botocore.session.Session().create_client(
-            's3', **self._client_kwargs
-        )
+        session = botocore.session.Session()
+        return create_nested_client(session, 's3', **self._client_kwargs)
 
 
 class TransferMonitor:
diff --git a/s3transfer/subscribers.py b/s3transfer/subscribers.py
@@ -20,7 +20,7 @@ class BaseSubscriber:
     """The base subscriber class
 
     It is recommended that all subscriber implementations subclass and then
-    override the subscription methods (i.e. on_{subsribe_type}() methods).
+    override the subscription methods (i.e. on_{subscribe_type}() methods).
     """
 
     VALID_SUBSCRIBER_TYPES = ['queued', 'progress', 'done']
diff --git a/s3transfer/utils.py b/s3transfer/utils.py
@@ -831,3 +831,18 @@ def set_default_checksum_algorithm(extra_args):
     if any(checksum in extra_args for checksum in FULL_OBJECT_CHECKSUM_ARGS):
         return
     extra_args.setdefault("ChecksumAlgorithm", DEFAULT_CHECKSUM_ALGORITHM)
+
+
+# NOTE: The following interfaces are considered private and are subject
+# to abrupt breaking changes. Please do not use them directly.
+
+try:
+    from botocore.utils import create_nested_client as create_client
+except ImportError:
+
+    def create_client(session, *args, **kwargs):
+        return session.create_client(*args, **kwargs)
+
+
+def create_nested_client(session, service_name, **kwargs):
+    return create_client(session, service_name, **kwargs)
diff --git a/scripts/performance/summarize b/scripts/performance/summarize
@@ -81,7 +81,7 @@ def human_readable_size(value):
     if bytes_int == 1:
         return '1 Byte'
     elif bytes_int < base:
-        return '%d Bytes' % bytes_int
+        return f'{bytes_int} Bytes'
 
     for i, suffix in enumerate(hummanize_suffixes):
         unit = base ** (i + 2)
diff --git a/setup.py b/setup.py
@@ -47,5 +47,6 @@ def get_version():
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
         'Programming Language :: Python :: 3.13',
+        'Programming Language :: Python :: 3.14',
     ],
 )
diff --git a/tests/functional/test_upload.py b/tests/functional/test_upload.py
@@ -458,7 +458,7 @@ def add_upload_part_responses_with_default_expected_params(
             if checksum_algorithm:
                 checksum_member = f'Checksum{checksum_algorithm.upper()}'
                 response = upload_part_response['service_response']
-                response[checksum_member] = f'sum{i+1}=='
+                response[checksum_member] = f'sum{i + 1}=='
 
             upload_part_response['expected_params'] = expected_params
             self.stubber.add_response(**upload_part_response)
diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
@@ -10,6 +10,7 @@
 # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
+import multiprocessing
 import os
 import shutil
 import signal
@@ -80,7 +81,15 @@ def test_non_file_like_obj(self):
 class TestBaseManager(unittest.TestCase):
     def create_pid_manager(self):
         class PIDManager(BaseManager):
-            pass
+            def __init__(self):
+                # Python 3.14 changed the non-macOS POSIX default to forkserver
+                # but the code in this module does not work with it
+                # See https://github.com/python/cpython/issues/125714
+                if multiprocessing.get_start_method() == 'forkserver':
+                    ctx = multiprocessing.get_context(method='fork')
+                else:
+                    ctx = multiprocessing.get_context()
+                super().__init__(ctx=ctx)
 
         PIDManager.register('getpid', os.getpid)
         return PIDManager()
diff --git a/tests/unit/test_futures.py b/tests/unit/test_futures.py
@@ -474,7 +474,7 @@ def get_executor(self, max_size=1, max_num_threads=1):
     def get_task(self, task_cls, main_kwargs=None):
         return task_cls(self.coordinator, main_kwargs=main_kwargs)
 
-    def get_sleep_task(self, sleep_time=0.01):
+    def get_sleep_task(self, sleep_time=0.03):
         return self.get_task(SleepTask, main_kwargs={'sleep_time': sleep_time})
 
     def add_semaphore(self, task_tag, count):
