Merge branch 'release-1.44.11' into develop

aws-sdk-python-automation · aws-sdk-python-automation · commit 30fb8d9e595f · 2026-01-02T23:38:51.000Z
* release-1.44.11:
  Bumping version to 1.44.11
diff --git a/.changes/1.44.11.json b/.changes/1.44.11.json
@@ -0,0 +1,7 @@
+[
+  {
+    "category": "``s3``",
+    "description": "Reverts addition of ``--case-conflict`` feature which caused a performance regression when copying from S3 to large local directories",
+    "type": "bugfix"
+  }
+]
diff --git a/.changes/next-release/bugfix-s3-44120.json b/.changes/next-release/bugfix-s3-44120.json
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+1.44.11
+=======
+
+* bugfix:``s3``: Reverts addition of ``--case-conflict`` feature which caused a performance regression when copying from S3 to large local directories
+
+
 1.44.10
 =======
 
diff --git a/awscli/__init__.py b/awscli/__init__.py
@@ -18,7 +18,7 @@
 
 import os
 
-__version__ = '1.44.10'
+__version__ = '1.44.11'
 
 #
 # Get our data path to be added to botocore's search path
diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -52,7 +52,7 @@
 # The short X.Y version.
 version = '1.44.'
 # The full version, including alpha/beta/rc tags.
-release = '1.44.10'
+release = '1.44.11'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.cfg b/setup.cfg
@@ -3,7 +3,7 @@ universal = 0
 
 [metadata]
 requires_dist =
-        botocore==1.42.20
+        botocore==1.42.21
         docutils>=0.18.1,<=0.19
         s3transfer>=0.16.0,<0.17.0
         PyYAML>=3.10,<6.1
diff --git a/setup.py b/setup.py
@@ -24,7 +24,7 @@ def find_version(*file_paths):
 
 
 install_requires = [
-    'botocore==1.42.20',
+    'botocore==1.42.21',
     'docutils>=0.18.1,<=0.19',
     's3transfer>=0.16.0,<0.17.0',
     'PyYAML>=3.10,<6.1',

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`import os`
`20`	`20`
`21`		`-__version__ = '1.44.10'`
	`21`	`+__version__ = '1.44.11'`
`22`	`22`
`23`	`23`	`#`
`24`	`24`	`# Get our data path to be added to botocore's search path`