Skip to content

Commit e2beb72

Browse files
authored
Revert "[v2] Add support for Python 3.14 (#10102)"
This reverts commit 291688b.
1 parent 291688b commit e2beb72

32 files changed

+587
-739
lines changed

.changes/next-release/enhancement-Python-47496.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Set up Python ${{ matrix.python-version }}
5757
uses: actions/setup-python@v5
5858
with:
59-
python-version: "3.14"
59+
python-version: "3.13"
6060
- name: Create changelog
6161
run: |
6262
python scripts/new-change -t '${{ github.event.inputs.type }}' -c '${{ github.event.inputs.category }}' -d '${{ github.event.inputs.description }}'

.github/workflows/run-dep-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
18+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
1919
os: [ubuntu-latest, macOS-latest, windows-latest]
2020

2121
steps:

.github/workflows/run-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
19+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
2020
os: [ubuntu-latest, macOS-latest, windows-latest]
2121

2222
steps:

.github/workflows/source-dist-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
19+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
2020
os: [ubuntu-latest, macOS-latest, windows-latest]
2121
steps:
2222
- uses: actions/checkout@v2

.github/workflows/update-lockfiles.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
python-version: ["3.14"]
33+
python-version: ["3.13"]
3434
os: [macOS-latest, windows-latest]
3535

3636
steps:

awscli/customizations/eks/ordered_yaml.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ def ordered_yaml_dump(to_dump, stream=None):
5151
"""
5252
yaml = ruamel.yaml.YAML(typ="safe", pure=True)
5353
yaml.default_flow_style = False
54-
yaml.width = float('inf')
5554
yaml.Representer.add_representer(OrderedDict, _ordered_representer)
5655

5756
if stream is None:

awscli/customizations/s3/s3handler.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -629,7 +629,9 @@ def _submit_transfer_request(self, fileinfo, extra_args, subscribers):
629629
self._result_queue.put(SuccessResult(**result_kwargs))
630630
except Exception as e:
631631
self._result_queue.put(FailureResult(exception=e, **result_kwargs))
632-
return True
632+
finally:
633+
# Return True to indicate that the transfer was submitted
634+
return True
633635

634636
def _format_src_dest(self, fileinfo):
635637
return self._format_local_path(fileinfo.src), None

pyproject.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"flit_core>=3.7.1,<3.12.1",
3+
"flit_core>=3.7.1,<3.9.1",
44
]
55
build-backend = "pep517"
66
backend-path = ["backends"]
@@ -28,17 +28,16 @@ classifiers = [
2828
"Programming Language :: Python :: 3.11",
2929
'Programming Language :: Python :: 3.12',
3030
"Programming Language :: Python :: 3.13",
31-
"Programming Language :: Python :: 3.14",
3231
]
3332
dependencies = [
3433
"colorama>=0.2.5,<0.4.7",
3534
"docutils>=0.10,<0.20",
36-
"ruamel.yaml>=0.15.0,<=0.19.1",
35+
"ruamel.yaml>=0.15.0,<=0.17.21",
3736
# ruamel.yaml only requires ruamel.yaml.clib for Python versions
3837
# less than or equal to Python 3.10. In order to ensure we have
3938
# a consistent dependency closure across all Python versions,
4039
# we explicitly include ruamel.yaml.clib as a dependency.
41-
"ruamel.yaml.clib>=0.2.0,<=0.2.15",
40+
"ruamel.yaml.clib>=0.2.0,<=0.2.12",
4241
"prompt-toolkit>=3.0.24,<3.0.52",
4342
"distro>=1.5.0,<1.9.0",
4443
"awscrt==0.31.2",

requirements-base-lock.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
#
55
# pip-compile --allow-unsafe --generate-hashes --output-file=requirements-base-lock.txt --unsafe-package=flit-core --unsafe-package=pip --unsafe-package=setuptools --unsafe-package=wheel requirements-base.txt
66
#
7-
packaging==26.0 \
8-
--hash=sha256:00243ae351a257117b6a241061796684b084ed1c516a08c48a3f7e147a9d80b4 \
9-
--hash=sha256:b36f1fef9334a5588b4166f8bcd26a14e521f2b55e6b9de3aaa80d3ff7a37529
10-
# via wheel
117

128
# The following packages are considered to be unsafe in a requirements file:
13-
flit-core==3.12.0 \
14-
--hash=sha256:18f63100d6f94385c6ed57a72073443e1a71a4acb4339491615d0f16d6ff01b2 \
15-
--hash=sha256:e7a0304069ea895172e3c7bb703292e992c5d1555dd1233ab7b5621b5b69e62c
9+
flit-core==3.9.0 \
10+
--hash=sha256:72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba \
11+
--hash=sha256:7aada352fb0c7f5538c4fafeddf314d3a6a92ee8e2b1de70482329e42de70301
1612
# via -r requirements-base.txt
1713
wheel==0.46.3 \
1814
--hash=sha256:4b399d56c9d9338230118d705d9737a2a468ccca63d5e813e2a4fc7815d8bc4d \

0 commit comments

Comments
 (0)