Merge branch 'release-0.17.0'

aws-sdk-python-automation · aws-sdk-python-automation · commit 28fe009e64b8 · 2026-04-29T19:50:37.000Z
* release-0.17.0: Bumping version to 0.17.0 Deprecate Python 3.9 support (#378) ci: group dependabot updates (#386) Update test_changelog.py Create test_changelog.py Bump actions/setup-python from 4.7.0 to 6.2.0 (#384) Bump github/codeql-action from 2.13.4 to 4.35.2 (#383) Bump actions/checkout from 5.0.0 to 6.0.2 (#380) Bump codecov/codecov-action from 3.1.4 to 6.0.0 (#382) Bump aws-actions/configure-aws-credentials from 6.0.0 to 6.1.0 (#381) chore: enable dependabot for pre-commit and refresh hook pins (#379)
diff --git a/.changes/0.17.0.json b/.changes/0.17.0.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "Python",
+    "description": "End of support for Python 3.9",
+    "type": "feature"
+  }
+]
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,25 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-patch"]
+    cooldown:
+      default-days: 7
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: "pre-commit"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    cooldown:
+      default-days: 7
+    groups:
+      pre-commit:
+        patterns:
+          - "*"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -20,18 +20,18 @@ jobs:
       security-events: write
     steps:
     - name: "Checkout repository"
-      uses: "actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8"
+      uses: "actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd"
       with:
         persist-credentials: false
 
     - name: "Run CodeQL init"
-      uses: "github/codeql-action/init@cdcdbb579706841c47f7063dda365e292e5cad7a"
+      uses: "github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225"
       with:
         config-file: "./.github/codeql.yml"
         languages: "python"
 
     - name: "Run CodeQL autobuild"
-      uses: "github/codeql-action/autobuild@cdcdbb579706841c47f7063dda365e292e5cad7a"
+      uses: "github/codeql-action/autobuild@95e58e9a2cdfd71adc6e0353d5c52f41a045d225"
 
     - name: "Run CodeQL analyze"
-      uses: "github/codeql-action/analyze@cdcdbb579706841c47f7063dda365e292e5cad7a"
+      uses: "github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225"
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -13,12 +13,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
       with:
         persist-credentials: false
-    - name: Set up Python 3.9
-      uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+    - name: Set up Python 3.10
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
       with:
-        python-version: 3.9
+        python-version: "3.10"
     - name: Run pre-commit
       uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
diff --git a/.github/workflows/pull-request-build.yml b/.github/workflows/pull-request-build.yml
@@ -26,7 +26,7 @@ jobs:
       contents: read
     steps:
       - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@8df5847569e6427dd6c4fb1cf565c83acfa8afa7
+        uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37
         with:
           role-to-assume: ${{ env.IAM_ROLE_ARN }}
           role-session-name: PullRequestBuildGitHubAction
diff --git a/.github/workflows/run-crt-test.yml b/.github/workflows/run-crt-test.yml
@@ -16,15 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "3.15-dev"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15-dev"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
       with:
         persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -16,15 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14", "3.15-dev"]
+        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.15-dev"]
         os: [ubuntu-latest, macOS-latest, windows-latest]
 
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
       with:
         persist-credentials: false
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@61a6322f88396a6271a6ee3565807d608ecaddd1
+      uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405
       with:
         python-version: ${{ matrix.python-version }}
         cache: 'pip'
@@ -36,6 +36,6 @@ jobs:
       run: |
         python scripts/ci/run-tests --with-cov
     - name: codecov
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d
+      uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2
       with:
         directory: tests
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,13 +1,13 @@
 exclude: ^(.changes/|CHANGELOG.rst|s3transfer/compat.py)
 repos:
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
-    rev: v5.0.0
+    rev: 3e8a8703264a2f4a69428a0aa4dcb512790b2c8c  # frozen: v6.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.12.0
+    rev: d1b833175a5d08a925900115526febd8fe71c98e  # frozen: v0.15.11
     hooks:
       - id: ruff-check
         args: [ --fix ]
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+0.17.0
+======
+
+* feature:Python: End of support for Python 3.9
+
+
 0.16.1
 ======
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -37,7 +37,7 @@ exclude = [
 line-length = 79
 indent-width = 4
 
-target-version = "py39"
+target-version = "py310"
 
 [tool.ruff.lint]
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
diff --git a/requirements-dev-lock.txt b/requirements-dev-lock.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --allow-unsafe --generate-hashes --output-file=requirements-dev-lock.txt requirements-dev.txt
diff --git a/s3transfer/__init__.py b/s3transfer/__init__.py
@@ -131,7 +131,6 @@ def __call__(self, bytes_amount):
 import os
 import queue
 import random
-import socket
 import string
 import threading
 from logging import NullHandler
@@ -146,7 +145,7 @@ def __call__(self, bytes_amount):
 from s3transfer.exceptions import RetriesExceededError, S3UploadFailedError
 
 __author__ = 'Amazon Web Services'
-__version__ = '0.16.1'
+__version__ = '0.17.0'
 
 
 logger = logging.getLogger(__name__)
@@ -617,7 +616,7 @@ def _download_range(
                         current_index += len(chunk)
                     return
                 except (
-                    socket.timeout,
+                    TimeoutError,
                     OSError,
                     ReadTimeoutError,
                     IncompleteReadError,
@@ -843,7 +842,7 @@ def _get_object(self, bucket, key, filename, extra_args, callback):
                     bucket, key, filename, extra_args, callback
                 )
             except (
-                socket.timeout,
+                TimeoutError,
                 OSError,
                 ReadTimeoutError,
                 IncompleteReadError,
diff --git a/setup.py b/setup.py
@@ -33,7 +33,7 @@ def get_version():
         'crt': 'botocore[crt]>=1.37.4,<2.0a.0',
     },
     license="Apache License 2.0",
-    python_requires=">= 3.9",
+    python_requires=">= 3.10",
     classifiers=[
         'Development Status :: 3 - Alpha',
         'Intended Audience :: Developers',
@@ -42,7 +42,6 @@ def get_version():
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3 :: Only',
-        'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
         'Programming Language :: Python :: 3.11',
         'Programming Language :: Python :: 3.12',
diff --git a/tests/unit/test_changelog.py b/tests/unit/test_changelog.py
@@ -0,0 +1,43 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+import json
+from pathlib import Path
+
+import pytest
+
+REPO_ROOT = Path(__file__).parents[2]
+NEXT_RELEASE_DIR = REPO_ROOT / '.changes' / 'next-release'
+
+
+def _next_release_json_files():
+    if not NEXT_RELEASE_DIR.is_dir():
+        return []
+    return [
+        p for p in sorted(NEXT_RELEASE_DIR.iterdir()) if p.suffix == '.json'
+    ]
+
+
+@pytest.mark.parametrize(
+    "json_path",
+    _next_release_json_files(),
+    ids=lambda p: p.name,
+)
+def test_next_release_json_is_well_formed(json_path):
+    raw = json_path.read_text('utf-8')
+    try:
+        entry = json.loads(raw)
+    except json.JSONDecodeError as e:
+        pytest.fail(f"{json_path.name} is not valid JSON: {e}")
+    assert isinstance(entry, dict), (
+        f"{json_path.name} should be a JSON object, got {type(entry).__name__}"
+    )
+    VALID_TYPES = {'feature', 'bugfix', 'enhancement', 'api-change'}
+    for key in ('category', 'description', 'type'):
+        assert key in entry, f"{json_path.name} missing required key '{key}'"
+        assert isinstance(entry[key], str) and entry[key].strip(), (
+            f"{json_path.name} key '{key}' must be a non-empty string"
+        )
+    assert entry['type'] in VALID_TYPES, (
+        f"{json_path.name} has invalid type '{entry['type']}', "
+        f"must be one of {sorted(VALID_TYPES)}"
+    )
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py39,py310,py311,py312,py313,py314
+envlist = py310,py311,py312,py313,py314
 
 # Comment to build sdist and install into virtualenv
 # This is helpful to test installation but takes extra time
