Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align with upstream #1308

Merged
merged 4 commits into from
Feb 27, 2025
Merged

Conversation

jakob-keller
Copy link
Collaborator

Description of Change

During preparation for compatibility with botocore 1.37.x, I noticed and fixed a few discrepancies with upstream:

  • fix class hierarchies of AioDeferredRefreshableCredentials and AioSSOCredentialFetcher to avoid unnecessary patches
  • add missing patches to test_patches.py
  • reduce minor drift in patched code (newlines, comments etc.)

Assumptions

We strive to keep aiobotocore closely aligned with upstream.

Checklist for All Submissions

  • I have added change info to CHANGES.rst
  • If this is resolving an issue (needed so future developers can determine if change is still necessary and under what conditions) (can be provided via link to issue with these details):
    • Detailed description of issue
    • Alternative methods considered (if any)
    • How issue is being resolved
    • How issue can be reproduced
  • If this is providing a new feature (can be provided via link to issue with these details):
    • Detailed description of new feature
    • Why needed
    • Alternatives methods considered (if any)

Checklist when updating botocore and/or aiohttp versions

  • I have read and followed CONTRIBUTING.rst
  • I have updated test_patches.py where/if appropriate (also check if no changes necessary)
  • I have ensured that the awscli/boto3 versions match the updated botocore version

@jakob-keller jakob-keller self-assigned this Feb 27, 2025
Copy link

codecov bot commented Feb 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.71%. Comparing base (17feaa1) to head (c785154).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1308      +/-   ##
==========================================
- Coverage   89.84%   89.71%   -0.14%     
==========================================
  Files          67       67              
  Lines        6086     6055      -31     
==========================================
- Hits         5468     5432      -36     
- Misses        618      623       +5     
Flag Coverage Δ
unittests 89.71% <100.00%> (-0.14%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@jakob-keller jakob-keller added this pull request to the merge queue Feb 27, 2025
@jakob-keller
Copy link
Collaborator Author

@thehesiod Thanks for review, as always!

@thehesiod
Copy link
Collaborator

@thehesiod Thanks for review, as always!

thank you for all the hard work! 🚀 If it breaks we'll need to make sure to put a comment why it is the way it is.

Merged via the queue into aio-libs:master with commit 7009ebe Feb 27, 2025
18 checks passed
@jakob-keller jakob-keller deleted the align-with-upstream branch February 27, 2025 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants