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.

Sign up for GitHub

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

Jump to bottom

Various pylint fixups #2444

Merged
merged 9 commits into from
Jan 14, 2025
Merged

Various pylint fixups #2444

merged 9 commits into from
Jan 14, 2025

Conversation

tremble
Copy link
Contributor

@tremble tremble commented Jan 8, 2025 •
edited
Loading

SUMMARY

fixes various linting warnings:

  • redefined-builtin
  • redefined-outer-name
  • no-else-continue
  • simplifiable-if-statement
  • unused-import
ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

plugins/modules/ec2_ami.py
plugins/modules/ec2_vpc_vpn.py
plugins/modules/s3_bucket.py
plugins/modules/s3_object.py
tests/unit/

ADDITIONAL INFORMATION

Also applies the "maybe_sleep" fixture to the ACM tests which have retries attached to them.

@softwarefactory-project-zuul softwarefactory-project-zuul

This comment was marked as outdated.

Sign in to view
@tremble
Copy link
Contributor Author

tremble commented Jan 9, 2025

recheck

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/efb22907d7554dd29a58da3152989216

✔️ ansible-galaxy-importer SUCCESS in 4m 31s
✔️ build-ansible-collection SUCCESS in 10m 23s
✔️ ansible-test-splitter SUCCESS in 4m 23s
✔️ integration-amazon.aws-1 SUCCESS in 16m 44s
✔️ integration-amazon.aws-2 SUCCESS in 12m 43s
✔️ integration-amazon.aws-3 SUCCESS in 8m 05s
✔️ integration-amazon.aws-4 SUCCESS in 8m 28s
✔️ integration-amazon.aws-5 SUCCESS in 17m 51s
✔️ integration-amazon.aws-6 SUCCESS in 5m 25s
Skipped 38 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

Build succeeded.
https://ansible.softwarefactory-project.io/zuul/buildset/81e84f9fa5be4f0c8b6fe2ebe57573e7

✔️ ansible-galaxy-importer SUCCESS in 5m 07s
✔️ build-ansible-collection SUCCESS in 10m 02s
✔️ ansible-test-splitter SUCCESS in 4m 35s
✔️ integration-amazon.aws-1 SUCCESS in 16m 31s
✔️ integration-amazon.aws-2 SUCCESS in 12m 50s
✔️ integration-amazon.aws-3 SUCCESS in 8m 41s
✔️ integration-amazon.aws-4 SUCCESS in 8m 00s
✔️ integration-amazon.aws-5 SUCCESS in 18m 00s
✔️ integration-amazon.aws-6 SUCCESS in 7m 36s
Skipped 38 jobs

@tremble tremble added mergeit Merge the PR (SoftwareFactory) backport-9 labels Jan 14, 2025
@softwarefactory-project-zuul softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 12m 42s
✔️ build-ansible-collection SUCCESS in 10m 31s
✔️ ansible-test-splitter SUCCESS in 3m 55s
✔️ integration-amazon.aws-1 SUCCESS in 17m 41s
✔️ integration-amazon.aws-2 SUCCESS in 13m 38s
✔️ integration-amazon.aws-3 SUCCESS in 9m 42s
✔️ integration-amazon.aws-4 SUCCESS in 8m 54s
✔️ integration-amazon.aws-5 SUCCESS in 18m 54s
✔️ integration-amazon.aws-6 SUCCESS in 7m 12s
Skipped 38 jobs

@softwarefactory-project-zuul softwarefactory-project-zuul bot merged commit bf4cb9a into ansible-collections:main Jan 14, 2025
46 of 49 checks passed
@patchback Patchback
Copy link

patchback bot commented Jan 14, 2025 •
edited
Loading

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

❌ Failed to cleanly apply bf4cb9a on top of patchback/backports/stable-9/bf4cb9a90b5f051649118773862de1a1dfb3c5a4/pr-2444

Backporting merged PR #2444 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/bf4cb9a90b5f051649118773862de1a1dfb3c5a4/pr-2444 upstream/stable-9
  4. Now, cherry-pick PR Various pylint fixups #2444 contents into that branch: 
    $ git cherry-pick -x bf4cb9a90b5f051649118773862de1a1dfb3c5a4
    If it'll yell at you with something like fatal: Commit bf4cb9a90b5f051649118773862de1a1dfb3c5a4 is a merge but no -m option was given., add -m 1 as follows instead: 
    $ git cherry-pick -m1 -x bf4cb9a90b5f051649118773862de1a1dfb3c5a4
  5. At this point, you'll probably encounter some merge conflicts. You must
    resolve them in to preserve the patch from PR Various pylint fixups #2444 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub: 
    $ git push origin patchback/backports/stable-9/bf4cb9a90b5f051649118773862de1a1dfb3c5a4/pr-2444
  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.

@tremble tremble added the backport_failed Backport failed, needs review label Jan 14, 2025
alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request Jan 15, 2025
@tremble @alinabuzachis
Various pylint fixups (ansible-collections#2444)
e583cfe 
SUMMARY
fixes various linting warnings:

redefined-builtin
redefined-outer-name
no-else-continue
simplifiable-if-statement
unused-import

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/modules/ec2_ami.py
plugins/modules/ec2_vpc_vpn.py
plugins/modules/s3_bucket.py
plugins/modules/s3_object.py
tests/unit/
ADDITIONAL INFORMATION
Also applies the "maybe_sleep" fixture to the ACM tests which have retries attached to them.

Reviewed-by: Alina Buzachis
alinabuzachis pushed a commit to alinabuzachis/amazon.aws that referenced this pull request Jan 15, 2025
@tremble @alinabuzachis
Various pylint fixups (ansible-collections#2444)
562e7db 
SUMMARY
fixes various linting warnings:

redefined-builtin
redefined-outer-name
no-else-continue
simplifiable-if-statement
unused-import

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/modules/ec2_ami.py
plugins/modules/ec2_vpc_vpn.py
plugins/modules/s3_bucket.py
plugins/modules/s3_object.py
tests/unit/
ADDITIONAL INFORMATION
Also applies the "maybe_sleep" fixture to the ACM tests which have retries attached to them.

Reviewed-by: Alina Buzachis
@tremble tremble mentioned this pull request Jan 22, 2025
Merged
softwarefactory-project-zuul bot pushed a commit to ansible-collections/community.aws that referenced this pull request Jan 22, 2025
@tremble
Fix unit tests (#2212)
959855c 
SUMMARY
Quick fix for unit test failures following ansible-collections/amazon.aws#2444
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
patchback bot pushed a commit to ansible-collections/community.aws that referenced this pull request Jan 22, 2025
@tremble @patchback
Fix unit tests (#2212)
2a60b35 
SUMMARY
Quick fix for unit test failures following ansible-collections/amazon.aws#2444
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
(cherry picked from commit 959855c)
@patchback patchback bot mentioned this pull request Jan 22, 2025
Merged
GomathiselviS pushed a commit that referenced this pull request Jan 31, 2025
@tremble @GomathiselviS
Various pylint fixups (#2444)
ab6414c 
SUMMARY
fixes various linting warnings:

redefined-builtin
redefined-outer-name
no-else-continue
simplifiable-if-statement
unused-import

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/modules/ec2_ami.py
plugins/modules/ec2_vpc_vpn.py
plugins/modules/s3_bucket.py
plugins/modules/s3_object.py
tests/unit/
ADDITIONAL INFORMATION
Also applies the "maybe_sleep" fixture to the ACM tests which have retries attached to them.

Reviewed-by: Alina Buzachis
tremble added a commit that referenced this pull request Feb 3, 2025
@tremble
Various pylint fixups (#2444)
c200bd0 
SUMMARY
fixes various linting warnings:

redefined-builtin
redefined-outer-name
no-else-continue
simplifiable-if-statement
unused-import

ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
plugins/modules/ec2_ami.py
plugins/modules/ec2_vpc_vpn.py
plugins/modules/s3_bucket.py
plugins/modules/s3_object.py
tests/unit/
ADDITIONAL INFORMATION
Also applies the "maybe_sleep" fixture to the ACM tests which have retries attached to them.

Reviewed-by: Alina Buzachis
softwarefactory-project-zuul bot pushed a commit that referenced this pull request Feb 3, 2025
@GomathiselviS
Various pylint fixups (#2444) (#2493)
5bef3a8 
SUMMARY
fixes various linting warnings:
redefined-builtin
redefined-outer-name
no-else-continue
simplifiable-if-statement
unused-import
ISSUE TYPE
Bugfix Pull Request
COMPONENT NAME
plugins/modules/ec2_ami.py
plugins/modules/ec2_vpc_vpn.py
plugins/modules/s3_bucket.py
plugins/modules/s3_object.py
tests/unit/
ADDITIONAL INFORMATION
Also applies the "maybe_sleep" fixture to the ACM tests which have retries attached to them.
Reviewed-by: Alina Buzachis
SUMMARY


ISSUE TYPE


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

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: Mandar Kulkarni <mandar242@gmail.com>
Reviewed-by: Mark Chappell
softwarefactory-project-zuul bot pushed a commit to ansible-collections/community.aws that referenced this pull request Feb 3, 2025
@patchback
Fix unit tests (#2212) (#2213)
9f75252 
This is a backport of PR #2212 as merged into main (959855c).
SUMMARY
Quick fix for unit test failures following ansible-collections/amazon.aws#2444
ISSUE TYPE

Bugfix Pull Request

COMPONENT NAME
ADDITIONAL INFORMATION

Reviewed-by: Bikouo Aubin
@tremble
Copy link
Contributor Author

tremble commented Feb 3, 2025

Manually backported

@tremble tremble removed the backport_failed Backport failed, needs review label Feb 3, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alinabuzachis alinabuzachis alinabuzachis approved these changes

@hakbailey hakbailey Awaiting requested review from hakbailey

Assignees
No one assigned
Labels
backport-9 mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tremble @alinabuzachis