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

Minor typing fixups #2497

Merged

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Feb 2, 2025

SUMMARY
  • module_utils.botocore - fixed type aliasing.
  • module_utils.botocore - avoid assigning unused parts of exc_info return.
  • plugin_utils.botocore - fixed type aliasing.
  • module_utils._s3 - explicitly cast super to the parent type.
  • module_utils.exceptions - avoid assigning unused parts of exc_info return.
ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/module_utils/_s3/common.py
plugins/module_utils/botocore.py
plugins/module_utils/exceptions.py
plugins/plugin_utils/botocore.py

ADDITIONAL INFORMATION

This comment was marked as resolved.

Copy link
Contributor

Build failed.
https://ansible.softwarefactory-project.io/zuul/buildset/8b401c5e7abc43b78f751063f376f102

✔️ ansible-galaxy-importer SUCCESS in 5m 54s
✔️ build-ansible-collection SUCCESS in 10m 08s
✔️ ansible-test-splitter SUCCESS in 4m 02s
✔️ integration-amazon.aws-1 SUCCESS in 47m 50s
✔️ integration-amazon.aws-2 SUCCESS in 47m 10s
✔️ integration-amazon.aws-3 SUCCESS in 24m 57s
✔️ integration-amazon.aws-4 SUCCESS in 37m 46s
✔️ integration-amazon.aws-5 SUCCESS in 32m 40s
✔️ integration-amazon.aws-6 SUCCESS in 47m 43s
✔️ integration-amazon.aws-7 SUCCESS in 46m 51s
✔️ integration-amazon.aws-8 SUCCESS in 26m 58s
✔️ integration-amazon.aws-9 SUCCESS in 43m 13s
✔️ integration-amazon.aws-10 SUCCESS in 38m 46s
✔️ integration-amazon.aws-11 SUCCESS in 25m 24s
✔️ integration-amazon.aws-12 SUCCESS in 24m 50s
✔️ integration-amazon.aws-13 SUCCESS in 22m 08s
✔️ integration-amazon.aws-14 SUCCESS in 25m 58s
✔️ integration-amazon.aws-15 SUCCESS in 38m 50s
✔️ integration-amazon.aws-16 SUCCESS in 34m 44s
✔️ integration-amazon.aws-17 SUCCESS in 20m 25s
✔️ integration-amazon.aws-18 SUCCESS in 24m 53s
✔️ integration-amazon.aws-19 SUCCESS in 38m 50s
✔️ integration-amazon.aws-20 SUCCESS in 33m 49s
✔️ integration-amazon.aws-21 SUCCESS in 46m 36s
✔️ integration-amazon.aws-22 SUCCESS in 43m 12s
✔️ integration-community.aws-1 SUCCESS in 28m 07s
integration-community.aws-2 RETRY_LIMIT in 1m 53s
✔️ integration-community.aws-3 SUCCESS in 16m 54s
✔️ integration-community.aws-4 SUCCESS in 23m 56s
✔️ integration-community.aws-5 SUCCESS in 17m 03s
✔️ integration-community.aws-6 SUCCESS in 16m 03s
✔️ integration-community.aws-7 SUCCESS in 25m 26s
✔️ integration-community.aws-8 SUCCESS in 14m 24s
✔️ integration-community.aws-9 SUCCESS in 11m 14s
✔️ integration-community.aws-10 SUCCESS in 16m 21s
✔️ integration-community.aws-11 SUCCESS in 8m 37s
✔️ integration-community.aws-12 SUCCESS in 11m 00s
✔️ integration-community.aws-13 SUCCESS in 10m 42s
✔️ integration-community.aws-14 SUCCESS in 6m 32s
Skipped 8 jobs

plugins/module_utils/botocore.py Outdated Show resolved Hide resolved
Co-authored-by: Bikouo Aubin <79859644+abikouo@users.noreply.github.com>
@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label Feb 3, 2025
Copy link
Contributor

Build succeeded (gate pipeline).
https://ansible.softwarefactory-project.io/zuul/buildset/f1248e2507254c878371e02a805e44c4

✔️ ansible-galaxy-importer SUCCESS in 6m 35s
✔️ build-ansible-collection SUCCESS in 10m 37s
✔️ ansible-test-splitter SUCCESS in 4m 11s
✔️ integration-amazon.aws-1 SUCCESS in 49m 33s
✔️ integration-amazon.aws-2 SUCCESS in 47m 51s
✔️ integration-amazon.aws-3 SUCCESS in 23m 26s
✔️ integration-amazon.aws-4 SUCCESS in 30m 27s
✔️ integration-amazon.aws-5 SUCCESS in 32m 09s
✔️ integration-amazon.aws-6 SUCCESS in 42m 10s
✔️ integration-amazon.aws-7 SUCCESS in 51m 14s
✔️ integration-amazon.aws-8 SUCCESS in 25m 47s
✔️ integration-amazon.aws-9 SUCCESS in 42m 01s
✔️ integration-amazon.aws-10 SUCCESS in 38m 27s
✔️ integration-amazon.aws-11 SUCCESS in 27m 16s
✔️ integration-amazon.aws-12 SUCCESS in 24m 38s
✔️ integration-amazon.aws-13 SUCCESS in 23m 12s
✔️ integration-amazon.aws-14 SUCCESS in 26m 52s
✔️ integration-amazon.aws-15 SUCCESS in 47m 30s
✔️ integration-amazon.aws-16 SUCCESS in 35m 48s
✔️ integration-amazon.aws-17 SUCCESS in 27m 55s
✔️ integration-amazon.aws-18 SUCCESS in 25m 47s
✔️ integration-amazon.aws-19 SUCCESS in 35m 12s
✔️ integration-amazon.aws-20 SUCCESS in 33m 32s
✔️ integration-amazon.aws-21 SUCCESS in 48m 54s
✔️ integration-amazon.aws-22 SUCCESS in 43m 14s
✔️ integration-community.aws-1 SUCCESS in 25m 39s
✔️ integration-community.aws-2 SUCCESS in 22m 02s
✔️ integration-community.aws-3 SUCCESS in 17m 56s
✔️ integration-community.aws-4 SUCCESS in 28m 29s
✔️ integration-community.aws-5 SUCCESS in 17m 34s
✔️ integration-community.aws-6 SUCCESS in 18m 56s
✔️ integration-community.aws-7 SUCCESS in 27m 11s
✔️ integration-community.aws-8 SUCCESS in 12m 28s
✔️ integration-community.aws-9 SUCCESS in 9m 04s
✔️ integration-community.aws-10 SUCCESS in 18m 55s
✔️ integration-community.aws-11 SUCCESS in 7m 49s
✔️ integration-community.aws-12 SUCCESS in 11m 53s
✔️ integration-community.aws-13 SUCCESS in 10m 57s
✔️ integration-community.aws-14 SUCCESS in 7m 21s
Skipped 8 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit 2564b0d into ansible-collections:main Feb 3, 2025
48 of 49 checks passed
Copy link

patchback bot commented Feb 3, 2025

Backport to stable-9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 2564b0d on top of patchback/backports/stable-9/2564b0d90eb6abec6c8313a047210c5abfcbb561/pr-2497

Backporting merged PR #2497 into main

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. Make sure you have an upstream repo added as a remote too. In these
    instructions you'll refer to it by the name upstream. If you don't
    have it, here's how you can add it:
    $ git remote add upstream https://github.com/ansible-collections/amazon.aws.git
  3. Ensure you have the latest copy of upstream and prepare a branch
    that will hold the backported code:
    $ git fetch upstream
    $ git checkout -b patchback/backports/stable-9/2564b0d90eb6abec6c8313a047210c5abfcbb561/pr-2497 upstream/stable-9
  4. Now, cherry-pick PR Minor typing fixups #2497 contents into that branch:
    $ git cherry-pick -x 2564b0d90eb6abec6c8313a047210c5abfcbb561
    If it'll yell at you with something like fatal: Commit 2564b0d90eb6abec6c8313a047210c5abfcbb561 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x 2564b0d90eb6abec6c8313a047210c5abfcbb561
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Minor typing fixups #2497 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/stable-9/2564b0d90eb6abec6c8313a047210c5abfcbb561/pr-2497
  7. Create a PR, ensure that the CI is green. If it's not — update it so that
    the tests and any other checks pass. This is it!
    Now relax and wait for the maintainers to process your pull request
    when they have some cycles to do reviews. Don't worry — they'll tell you if
    any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

@github-actions github-actions bot added the backport_failed Backport failed, needs review label Feb 3, 2025
@tremble
Copy link
Contributor Author

tremble commented Feb 3, 2025

Depends on #2478 to backport to stable-9

GomathiselviS pushed a commit to GomathiselviS/amazon.aws that referenced this pull request Feb 3, 2025
SUMMARY

module_utils.botocore - fixed type aliasing.
module_utils.botocore - avoid assigning unused parts of exc_info return.
plugin_utils.botocore - fixed type aliasing.
module_utils._s3 - explicitly cast super to the parent type.
module_utils.exceptions - avoid assigning unused parts of exc_info return.

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/module_utils/_s3/common.py
plugins/module_utils/botocore.py
plugins/module_utils/exceptions.py
plugins/plugin_utils/botocore.py
ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
(cherry picked from commit 2564b0d)
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 3, 2025
SUMMARY
module_utils.botocore - fixed type aliasing.
module_utils.botocore - avoid assigning unused parts of exc_info return. plugin_utils.botocore - fixed type aliasing.
module_utils._s3 - explicitly cast super to the parent type. module_utils.exceptions - avoid assigning unused parts of exc_info return.
ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
plugins/module_utils/_s3/common.py
plugins/module_utils/botocore.py
plugins/module_utils/exceptions.py
plugins/plugin_utils/botocore.py
ADDITIONAL INFORMATION
Reviewed-by: Bikouo Aubin
(cherry picked from commit 2564b0d)
SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
@GomathiselviS GomathiselviS removed the backport_failed Backport failed, needs review label Feb 4, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-9 mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants