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

Bulk migration to Python 3.6 f-strings (3) #1527

Merged
merged 3 commits into from
May 8, 2023

Conversation

tremble
Copy link
Contributor

@tremble tremble commented May 7, 2023

SUMMARY

We've dropped support for Python <3.6, bulk migrate to fstrings and perform some general string cleanup

A combination of

  • black --preview
  • flynt
  • some manual cleanup
ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

plugins/module_utils/acm.py
plugins/module_utils/backup.py
plugins/module_utils/cloudfront_facts.py
plugins/module_utils/direct_connect.py
plugins/module_utils/elbv2.py
plugins/module_utils/iam.py
plugins/module_utils/policy.py
plugins/module_utils/route53.py
plugins/module_utils/s3.py
plugins/module_utils/urls.py

ADDITIONAL INFORMATION

We've dropped support for Python <3.6, bulk migrate to fstrings and perform some general string cleanup

A combination of
* `black --preview`
* `flynt`
* some manual cleanup
@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 59s
✔️ build-ansible-collection SUCCESS in 12m 40s
✔️ ansible-test-splitter SUCCESS in 5m 04s
✔️ integration-amazon.aws-1 SUCCESS in 14m 13s
✔️ integration-amazon.aws-2 SUCCESS in 19m 01s
✔️ integration-amazon.aws-3 SUCCESS in 27m 57s
✔️ integration-amazon.aws-4 SUCCESS in 22m 54s
✔️ integration-amazon.aws-5 SUCCESS in 19m 41s
✔️ integration-amazon.aws-6 SUCCESS in 14m 25s
✔️ integration-amazon.aws-7 SUCCESS in 16m 30s
✔️ integration-amazon.aws-8 SUCCESS in 16m 07s
✔️ integration-amazon.aws-9 SUCCESS in 24m 42s
✔️ integration-amazon.aws-10 SUCCESS in 14m 32s
✔️ integration-amazon.aws-11 SUCCESS in 20m 41s
✔️ integration-amazon.aws-12 SUCCESS in 9m 40s
✔️ integration-amazon.aws-13 SUCCESS in 18m 12s
✔️ integration-amazon.aws-14 SUCCESS in 21m 11s
✔️ integration-amazon.aws-15 SUCCESS in 20m 34s
✔️ integration-amazon.aws-16 SUCCESS in 14m 51s
✔️ integration-amazon.aws-17 SUCCESS in 22m 26s
✔️ integration-amazon.aws-18 SUCCESS in 10m 24s
✔️ integration-amazon.aws-19 SUCCESS in 11m 07s
✔️ integration-amazon.aws-20 SUCCESS in 8m 51s
✔️ integration-community.aws-1 SUCCESS in 25m 26s
✔️ integration-community.aws-2 SUCCESS in 26m 45s
✔️ integration-community.aws-3 SUCCESS in 13m 43s
✔️ integration-community.aws-4 SUCCESS in 19m 36s
✔️ integration-community.aws-5 SUCCESS in 21m 54s
✔️ integration-community.aws-6 SUCCESS in 9m 54s
✔️ integration-community.aws-7 SUCCESS in 8m 51s
✔️ integration-community.aws-8 SUCCESS in 5m 38s
✔️ integration-community.aws-9 SUCCESS in 5m 51s
✔️ integration-community.aws-10 SUCCESS in 6m 09s
✔️ integration-community.aws-11 SUCCESS in 7m 14s
✔️ integration-community.aws-12 SUCCESS in 6m 09s
✔️ integration-community.aws-13 SUCCESS in 5m 29s
✔️ integration-community.aws-14 SUCCESS in 6m 50s
Skipped 10 jobs

@tremble tremble marked this pull request as ready for review May 7, 2023 11:21
@tremble tremble requested a review from alinabuzachis May 7, 2023 11:21
@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 4m 19s
✔️ build-ansible-collection SUCCESS in 13m 14s
✔️ ansible-test-splitter SUCCESS in 5m 06s
✔️ integration-amazon.aws-1 SUCCESS in 15m 02s
✔️ integration-amazon.aws-2 SUCCESS in 17m 29s
✔️ integration-amazon.aws-3 SUCCESS in 25m 50s
✔️ integration-amazon.aws-4 SUCCESS in 26m 10s
✔️ integration-amazon.aws-5 SUCCESS in 19m 09s
✔️ integration-amazon.aws-6 SUCCESS in 12m 33s
✔️ integration-amazon.aws-7 SUCCESS in 13m 08s
✔️ integration-amazon.aws-8 SUCCESS in 9m 20s
✔️ integration-amazon.aws-9 SUCCESS in 14m 04s
✔️ integration-amazon.aws-10 SUCCESS in 12m 56s
✔️ integration-amazon.aws-11 SUCCESS in 18m 06s
✔️ integration-amazon.aws-12 SUCCESS in 13m 55s
✔️ integration-amazon.aws-13 SUCCESS in 18m 18s
✔️ integration-amazon.aws-14 SUCCESS in 18m 54s
✔️ integration-amazon.aws-15 SUCCESS in 15m 08s
✔️ integration-amazon.aws-16 SUCCESS in 9m 04s
✔️ integration-amazon.aws-17 SUCCESS in 21m 22s
✔️ integration-amazon.aws-18 SUCCESS in 12m 27s
✔️ integration-amazon.aws-19 SUCCESS in 13m 14s
✔️ integration-amazon.aws-20 SUCCESS in 9m 07s
integration-community.aws-1 FAILURE in 5m 50s
✔️ integration-community.aws-2 SUCCESS in 22m 43s
✔️ integration-community.aws-3 SUCCESS in 19m 02s
✔️ integration-community.aws-4 SUCCESS in 17m 35s
✔️ integration-community.aws-5 SUCCESS in 24m 58s
✔️ integration-community.aws-6 SUCCESS in 8m 30s
✔️ integration-community.aws-7 SUCCESS in 9m 55s
✔️ integration-community.aws-8 SUCCESS in 5m 52s
✔️ integration-community.aws-9 SUCCESS in 5m 55s
✔️ integration-community.aws-10 SUCCESS in 8m 54s
✔️ integration-community.aws-11 SUCCESS in 8m 22s
✔️ integration-community.aws-12 SUCCESS in 6m 42s
✔️ integration-community.aws-13 SUCCESS in 5m 36s
Skipped 11 jobs

@alinabuzachis
Copy link
Collaborator

recheck

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 31s
✔️ build-ansible-collection SUCCESS in 12m 55s
✔️ ansible-test-splitter SUCCESS in 5m 13s
✔️ integration-amazon.aws-1 SUCCESS in 13m 03s
integration-amazon.aws-2 RETRY_LIMIT in 1m 33s
integration-amazon.aws-3 RETRY_LIMIT in 1m 35s
integration-amazon.aws-4 RETRY_LIMIT in 1m 33s
✔️ integration-amazon.aws-5 SUCCESS in 21m 11s
✔️ integration-amazon.aws-6 SUCCESS in 13m 10s
✔️ integration-amazon.aws-7 SUCCESS in 11m 18s
✔️ integration-amazon.aws-8 SUCCESS in 12m 59s
✔️ integration-amazon.aws-9 SUCCESS in 16m 34s
✔️ integration-amazon.aws-10 SUCCESS in 12m 02s
✔️ integration-amazon.aws-11 SUCCESS in 16m 13s
✔️ integration-amazon.aws-12 SUCCESS in 12m 24s
✔️ integration-amazon.aws-13 SUCCESS in 19m 06s
✔️ integration-amazon.aws-14 SUCCESS in 23m 11s
✔️ integration-amazon.aws-15 SUCCESS in 17m 00s
✔️ integration-amazon.aws-16 SUCCESS in 11m 51s
✔️ integration-amazon.aws-17 SUCCESS in 21m 29s
✔️ integration-amazon.aws-18 SUCCESS in 11m 14s
✔️ integration-amazon.aws-19 SUCCESS in 13m 39s
✔️ integration-amazon.aws-20 SUCCESS in 12m 31s
✔️ integration-community.aws-1 SUCCESS in 7m 08s
✔️ integration-community.aws-2 SUCCESS in 23m 20s
✔️ integration-community.aws-3 SUCCESS in 24m 49s
✔️ integration-community.aws-4 SUCCESS in 20m 30s
✔️ integration-community.aws-5 SUCCESS in 24m 05s
✔️ integration-community.aws-6 SUCCESS in 9m 29s
✔️ integration-community.aws-7 SUCCESS in 8m 41s
✔️ integration-community.aws-8 SUCCESS in 5m 45s
✔️ integration-community.aws-9 SUCCESS in 5m 28s
✔️ integration-community.aws-10 SUCCESS in 6m 03s
✔️ integration-community.aws-11 SUCCESS in 9m 48s
✔️ integration-community.aws-12 SUCCESS in 7m 57s
✔️ integration-community.aws-13 SUCCESS in 5m 30s
✔️ integration-community.aws-14 SUCCESS in 5m 12s
Skipped 10 jobs

@tremble tremble added the mergeit Merge the PR (SoftwareFactory) label May 8, 2023
@softwarefactory-project-zuul
Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://ansible.softwarefactory-project.io/zuul/buildset/fb293a25f33a43848e449d5e809c4585

✔️ ansible-galaxy-importer SUCCESS in 4m 16s
✔️ build-ansible-collection SUCCESS in 13m 09s
✔️ ansible-test-splitter SUCCESS in 4m 44s
✔️ integration-amazon.aws-1 SUCCESS in 13m 57s
✔️ integration-amazon.aws-2 SUCCESS in 20m 34s
✔️ integration-amazon.aws-3 SUCCESS in 24m 58s
✔️ integration-amazon.aws-4 SUCCESS in 22m 05s
✔️ integration-amazon.aws-5 SUCCESS in 17m 43s
integration-amazon.aws-6 FAILURE in 12m 40s
✔️ integration-amazon.aws-7 SUCCESS in 9m 05s
✔️ integration-amazon.aws-8 SUCCESS in 14m 30s
✔️ integration-amazon.aws-9 SUCCESS in 18m 32s
✔️ integration-amazon.aws-10 SUCCESS in 17m 40s
✔️ integration-amazon.aws-11 SUCCESS in 20m 17s
✔️ integration-amazon.aws-12 SUCCESS in 15m 00s
✔️ integration-amazon.aws-13 SUCCESS in 22m 22s
✔️ integration-amazon.aws-14 SUCCESS in 20m 52s
✔️ integration-amazon.aws-15 SUCCESS in 14m 49s
✔️ integration-amazon.aws-16 SUCCESS in 12m 31s
✔️ integration-amazon.aws-17 SUCCESS in 23m 54s
✔️ integration-amazon.aws-18 SUCCESS in 12m 32s
✔️ integration-amazon.aws-19 SUCCESS in 13m 38s
✔️ integration-amazon.aws-20 SUCCESS in 12m 03s
✔️ integration-community.aws-1 SUCCESS in 23m 16s
✔️ integration-community.aws-2 SUCCESS in 21m 22s
✔️ integration-community.aws-3 SUCCESS in 10m 51s
✔️ integration-community.aws-4 SUCCESS in 19m 40s
✔️ integration-community.aws-5 SUCCESS in 19m 50s
✔️ integration-community.aws-6 SUCCESS in 8m 34s
✔️ integration-community.aws-7 SUCCESS in 10m 45s
✔️ integration-community.aws-8 SUCCESS in 7m 09s
✔️ integration-community.aws-9 SUCCESS in 6m 04s
✔️ integration-community.aws-10 SUCCESS in 8m 03s
✔️ integration-community.aws-11 SUCCESS in 8m 24s
✔️ integration-community.aws-12 SUCCESS in 8m 25s
✔️ integration-community.aws-13 SUCCESS in 5m 50s
Skipped 11 jobs

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 42s
✔️ build-ansible-collection SUCCESS in 13m 32s
✔️ ansible-test-splitter SUCCESS in 5m 07s
✔️ integration-amazon.aws-1 SUCCESS in 12m 18s
✔️ integration-amazon.aws-2 SUCCESS in 18m 23s
✔️ integration-amazon.aws-3 SUCCESS in 21m 44s
✔️ integration-amazon.aws-4 SUCCESS in 21m 41s
✔️ integration-amazon.aws-5 SUCCESS in 18m 22s
✔️ integration-amazon.aws-6 SUCCESS in 12m 05s
✔️ integration-amazon.aws-7 SUCCESS in 9m 44s
✔️ integration-amazon.aws-8 SUCCESS in 13m 35s
✔️ integration-amazon.aws-9 SUCCESS in 14m 40s
✔️ integration-amazon.aws-10 SUCCESS in 13m 29s
✔️ integration-amazon.aws-11 SUCCESS in 20m 16s
✔️ integration-amazon.aws-12 SUCCESS in 13m 32s
✔️ integration-amazon.aws-13 SUCCESS in 18m 00s
✔️ integration-amazon.aws-14 SUCCESS in 19m 20s
✔️ integration-amazon.aws-15 SUCCESS in 14m 46s
✔️ integration-amazon.aws-16 SUCCESS in 13m 07s
✔️ integration-amazon.aws-17 SUCCESS in 22m 47s
✔️ integration-amazon.aws-18 SUCCESS in 10m 46s
✔️ integration-amazon.aws-19 SUCCESS in 11m 56s
✔️ integration-amazon.aws-20 SUCCESS in 9m 17s
✔️ integration-community.aws-1 SUCCESS in 6m 18s
✔️ integration-community.aws-2 SUCCESS in 22m 51s
✔️ integration-community.aws-3 SUCCESS in 13m 57s
✔️ integration-community.aws-4 SUCCESS in 18m 33s
✔️ integration-community.aws-5 SUCCESS in 23m 02s
✔️ integration-community.aws-6 SUCCESS in 11m 54s
✔️ integration-community.aws-7 SUCCESS in 11m 22s
✔️ integration-community.aws-8 SUCCESS in 6m 01s
✔️ integration-community.aws-9 SUCCESS in 5m 29s
✔️ integration-community.aws-10 SUCCESS in 6m 09s
✔️ integration-community.aws-11 SUCCESS in 7m 33s
✔️ integration-community.aws-12 SUCCESS in 7m 56s
✔️ integration-community.aws-13 SUCCESS in 5m 28s
Skipped 11 jobs

@softwarefactory-project-zuul
Copy link
Contributor

Build failed (gate pipeline). For information on how to proceed, see
http://docs.openstack.org/infra/manual/developers.html#automated-testing

https://ansible.softwarefactory-project.io/zuul/buildset/861ab31442f94c96bf879914fc47f8b9

✔️ ansible-galaxy-importer SUCCESS in 4m 10s
✔️ build-ansible-collection SUCCESS in 12m 54s
✔️ ansible-test-splitter SUCCESS in 4m 57s
✔️ integration-amazon.aws-1 SUCCESS in 12m 53s
✔️ integration-amazon.aws-2 SUCCESS in 16m 36s
✔️ integration-amazon.aws-3 SUCCESS in 26m 01s
✔️ integration-amazon.aws-4 SUCCESS in 23m 28s
✔️ integration-amazon.aws-5 SUCCESS in 18m 12s
✔️ integration-amazon.aws-6 SUCCESS in 12m 45s
✔️ integration-amazon.aws-7 SUCCESS in 11m 14s
✔️ integration-amazon.aws-8 SUCCESS in 13m 45s
✔️ integration-amazon.aws-9 SUCCESS in 16m 47s
✔️ integration-amazon.aws-10 SUCCESS in 15m 02s
✔️ integration-amazon.aws-11 SUCCESS in 15m 01s
✔️ integration-amazon.aws-12 SUCCESS in 12m 28s
✔️ integration-amazon.aws-13 SUCCESS in 19m 18s
✔️ integration-amazon.aws-14 SUCCESS in 18m 57s
✔️ integration-amazon.aws-15 SUCCESS in 21m 15s
✔️ integration-amazon.aws-16 SUCCESS in 8m 50s
✔️ integration-amazon.aws-17 SUCCESS in 24m 18s
✔️ integration-amazon.aws-18 SUCCESS in 13m 11s
integration-amazon.aws-19 FAILURE in 15m 05s
✔️ integration-amazon.aws-20 SUCCESS in 11m 10s
✔️ integration-community.aws-1 SUCCESS in 26m 28s
✔️ integration-community.aws-2 SUCCESS in 20m 35s
✔️ integration-community.aws-3 SUCCESS in 12m 29s
✔️ integration-community.aws-4 SUCCESS in 20m 12s
✔️ integration-community.aws-5 SUCCESS in 23m 43s
✔️ integration-community.aws-6 SUCCESS in 11m 22s
✔️ integration-community.aws-7 SUCCESS in 11m 13s
✔️ integration-community.aws-8 SUCCESS in 6m 03s
✔️ integration-community.aws-9 SUCCESS in 6m 14s
✔️ integration-community.aws-10 SUCCESS in 6m 50s
✔️ integration-community.aws-11 SUCCESS in 7m 36s
✔️ integration-community.aws-12 SUCCESS in 6m 26s
✔️ integration-community.aws-13 SUCCESS in 5m 53s
Skipped 11 jobs

Copy link
Collaborator

@jillr jillr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

manually merging as this is a large PR

@jillr jillr merged commit 4b63a32 into ansible-collections:main May 8, 2023
@tremble tremble deleted the fstring/utils/1 branch September 27, 2023 07:00
abikouo pushed a commit to abikouo/amazon.aws that referenced this pull request Oct 24, 2023
…#1527)

* Update docs links - rds_option_group*
* Update docs links - rds_subnet_group
* Update docs links - rds_param_group
* Remove duplicate entries

Co-authored-by: Mark Chappell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mergeit Merge the PR (SoftwareFactory)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants