Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: boto/boto3
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.37.5
Choose a base ref
...
head repository: boto/boto3
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.37.6
Choose a head ref
  • 8 commits
  • 7 files changed
  • 4 contributors

Commits on Mar 3, 2025

  1. Merge branch 'release-1.37.5' into develop

    * release-1.37.5:
      Bumping version to 1.37.5
      Add changelog entries from botocore
    aws-sdk-python-automation committed Mar 3, 2025
    Copy the full SHA
    b0919bf View commit details

Commits on Mar 4, 2025

  1. Update lint workflow to use ubuntu-latest (#4459)

    jonathan343 authored Mar 4, 2025
    Copy the full SHA
    3167931 View commit details
  2. Track S3Transfer usage

    hssyoo committed Mar 4, 2025

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    1628564 View commit details
  3. Don't require UA 2.1

    hssyoo committed Mar 4, 2025
    Copy the full SHA
    90a13a0 View commit details
  4. Track S3Transfer usage in user agent

    hssyoo authored Mar 4, 2025
    Copy the full SHA
    ded41fc View commit details
  5. Copy the full SHA
    d200fd0 View commit details
  6. Copy the full SHA
    04ca62f View commit details
  7. Merge branch 'release-1.37.6'

    * release-1.37.6:
      Bumping version to 1.37.6
      Add changelog entries from botocore
      Don't require UA 2.1
      Track S3Transfer usage
      Update lint workflow to use ubuntu-latest (#4459)
    aws-sdk-python-automation committed Mar 4, 2025
    Copy the full SHA
    2f11685 View commit details
Showing with 64 additions and 4 deletions.
  1. +22 −0 .changes/1.37.6.json
  2. +1 −1 .github/workflows/lint.yml
  3. +9 −0 CHANGELOG.rst
  4. +1 −1 boto3/__init__.py
  5. +29 −0 boto3/s3/inject.py
  6. +1 −1 setup.cfg
  7. +1 −1 setup.py
22 changes: 22 additions & 0 deletions .changes/1.37.6.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[
{
"category": "``elasticache``",
"description": "[``botocore``] Doc only update, listing 'valkey7' and 'valkey8' as engine options for parameter groups.",
"type": "api-change"
},
{
"category": "``iot-managed-integrations``",
"description": "[``botocore``] Adding managed integrations APIs for IoT Device Management to setup and control devices across different manufacturers and connectivity protocols. APIs include managedthing operations, credential and provisioning profile management, notification configuration, and OTA update.",
"type": "api-change"
},
{
"category": "``iotsitewise``",
"description": "[``botocore``] AWS IoT SiteWise now supports MQTT-enabled, V3 gateways. Configure data destinations for real-time ingestion into AWS IoT SiteWise or buffered ingestion using Amazon S3 storage. You can also use path filters for precise data collection from specific MQTT topics.",
"type": "api-change"
},
{
"category": "``rds``",
"description": "[``botocore``] Note support for Database Insights for Amazon RDS.",
"type": "api-change"
}
]
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ permissions:

jobs:
lint:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
9 changes: 9 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -2,6 +2,15 @@
CHANGELOG
=========

1.37.6
======

* api-change:``elasticache``: [``botocore``] Doc only update, listing 'valkey7' and 'valkey8' as engine options for parameter groups.
* api-change:``iot-managed-integrations``: [``botocore``] Adding managed integrations APIs for IoT Device Management to setup and control devices across different manufacturers and connectivity protocols. APIs include managedthing operations, credential and provisioning profile management, notification configuration, and OTA update.
* api-change:``iotsitewise``: [``botocore``] AWS IoT SiteWise now supports MQTT-enabled, V3 gateways. Configure data destinations for real-time ingestion into AWS IoT SiteWise or buffered ingestion using Amazon S3 storage. You can also use path filters for precise data collection from specific MQTT topics.
* api-change:``rds``: [``botocore``] Note support for Database Insights for Amazon RDS.


1.37.5
======

2 changes: 1 addition & 1 deletion boto3/__init__.py
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
from boto3.session import Session

__author__ = 'Amazon Web Services'
__version__ = '1.37.5'
__version__ = '1.37.6'


# The default Boto3 session; autoloaded when needed.
29 changes: 29 additions & 0 deletions boto3/s3/inject.py
Original file line number Diff line number Diff line change
@@ -11,6 +11,7 @@
# ANY KIND, either express or implied. See the License for the specific
# language governing permissions and limitations under the License.
import copy as python_copy
from functools import partial

from botocore.exceptions import ClientError

@@ -22,6 +23,29 @@
create_transfer_manager,
)

try:
from botocore.context import with_current_context
except ImportError:
from functools import wraps

def with_current_context(hook=None):
def decorator(func):
@wraps(func)
def wrapper(*args, **kwargs):
return func(*args, **kwargs)

return wrapper

return decorator


try:
from botocore.useragent import register_feature_id
except ImportError:

def register_feature_id(feature_id):
pass


def inject_s3_transfer_methods(class_attributes, **kwargs):
utils.inject_attribute(class_attributes, 'upload_file', upload_file)
@@ -104,6 +128,7 @@ def object_summary_load(self, *args, **kwargs):
self.meta.data = response


@with_current_context(partial(register_feature_id, 'S3_TRANSFER'))
def upload_file(
self, Filename, Bucket, Key, ExtraArgs=None, Callback=None, Config=None
):
@@ -151,6 +176,7 @@ def upload_file(
)


@with_current_context(partial(register_feature_id, 'S3_TRANSFER'))
def download_file(
self, Bucket, Key, Filename, ExtraArgs=None, Callback=None, Config=None
):
@@ -368,6 +394,7 @@ def object_download_file(
)


@with_current_context(partial(register_feature_id, 'S3_TRANSFER'))
def copy(
self,
CopySource,
@@ -579,6 +606,7 @@ def object_copy(
)


@with_current_context(partial(register_feature_id, 'S3_TRANSFER'))
def upload_fileobj(
self, Fileobj, Bucket, Key, ExtraArgs=None, Callback=None, Config=None
):
@@ -738,6 +766,7 @@ def object_upload_fileobj(
)


@with_current_context(partial(register_feature_id, 'S3_TRANSFER'))
def download_fileobj(
self, Bucket, Key, Fileobj, ExtraArgs=None, Callback=None, Config=None
):
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ universal = 0

[metadata]
requires_dist =
botocore>=1.37.5,<1.38.0
botocore>=1.37.6,<1.38.0
jmespath>=0.7.1,<2.0.0
s3transfer>=0.11.0,<0.12.0

2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@


requires = [
'botocore>=1.37.5,<1.38.0',
'botocore>=1.37.6,<1.38.0',
'jmespath>=0.7.1,<2.0.0',
's3transfer>=0.11.0,<0.12.0',
]