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 (4) #1529

Merged
merged 2 commits into from
May 8, 2023

Conversation

tremble
Copy link
Contributor

@tremble tremble commented May 7, 2023

Depends-On: #1526

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/ec2.py
plugins/module_utils/modules.py
plugins/module_utils/tagging.py
plugins/module_utils/waiters.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
@tremble tremble changed the title Fstring cleanup Bulk migration to Python 3.6 f-strings (4) May 7, 2023
@tremble tremble marked this pull request as ready for review May 7, 2023 14:15
@tremble tremble requested a review from alinabuzachis May 7, 2023 14:17
@softwarefactory-project-zuul
Copy link
Contributor

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

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

@alinabuzachis
Copy link
Collaborator

recheck

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 40s
✔️ build-ansible-collection SUCCESS in 13m 13s
✔️ ansible-test-splitter SUCCESS in 4m 58s
✔️ integration-amazon.aws-1 SUCCESS in 34m 06s
✔️ integration-amazon.aws-2 SUCCESS in 20m 27s
✔️ integration-amazon.aws-3 SUCCESS in 28m 41s
✔️ integration-amazon.aws-4 SUCCESS in 27m 35s
✔️ integration-amazon.aws-5 SUCCESS in 35m 18s
✔️ integration-amazon.aws-6 SUCCESS in 15m 11s
✔️ integration-amazon.aws-7 SUCCESS in 40m 20s
✔️ integration-amazon.aws-8 SUCCESS in 40m 07s
✔️ integration-amazon.aws-9 SUCCESS in 32m 58s
✔️ integration-amazon.aws-10 SUCCESS in 32m 03s
✔️ integration-amazon.aws-11 SUCCESS in 27m 00s
✔️ integration-amazon.aws-12 SUCCESS in 17m 07s
✔️ integration-amazon.aws-13 SUCCESS in 28m 35s
✔️ integration-amazon.aws-14 SUCCESS in 31m 22s
✔️ integration-amazon.aws-15 SUCCESS in 34m 06s
integration-amazon.aws-16 RETRY_LIMIT in 1m 34s
✔️ integration-amazon.aws-17 SUCCESS in 34m 02s
✔️ integration-amazon.aws-18 SUCCESS in 22m 18s
✔️ integration-amazon.aws-19 SUCCESS in 29m 21s
integration-amazon.aws-20 RETRY_LIMIT in 1m 33s
integration-amazon.aws-21 RETRY_LIMIT in 1m 34s
✔️ integration-amazon.aws-22 SUCCESS in 23m 20s
✔️ integration-community.aws-1 SUCCESS in 37m 49s
✔️ integration-community.aws-2 SUCCESS in 21m 46s
✔️ integration-community.aws-3 SUCCESS in 46m 28s
✔️ integration-community.aws-4 SUCCESS in 48m 32s
✔️ integration-community.aws-5 SUCCESS in 21m 08s
✔️ integration-community.aws-6 SUCCESS in 22m 10s
integration-community.aws-7 RETRY_LIMIT in 1m 33s
✔️ integration-community.aws-8 SUCCESS in 17m 59s
integration-community.aws-9 RETRY_LIMIT in 1m 34s
✔️ integration-community.aws-10 SUCCESS in 19m 04s
✔️ integration-community.aws-11 SUCCESS in 23m 36s
✔️ integration-community.aws-12 SUCCESS in 30m 00s
integration-community.aws-13 FAILURE in 39m 08s
✔️ integration-community.aws-14 SUCCESS in 10m 38s
✔️ integration-community.aws-15 SUCCESS in 12m 15s
Skipped 7 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/049307707348479584801e2a1aaf821e

✔️ ansible-galaxy-importer SUCCESS in 4m 19s
✔️ build-ansible-collection SUCCESS in 12m 38s
✔️ ansible-test-splitter SUCCESS in 4m 56s
✔️ integration-amazon.aws-1 SUCCESS in 26m 53s
✔️ integration-amazon.aws-2 SUCCESS in 24m 32s
✔️ integration-amazon.aws-3 SUCCESS in 31m 28s
✔️ integration-amazon.aws-4 SUCCESS in 29m 16s
✔️ integration-amazon.aws-5 SUCCESS in 36m 46s
✔️ integration-amazon.aws-6 SUCCESS in 20m 13s
✔️ integration-amazon.aws-7 SUCCESS in 47m 25s
✔️ integration-amazon.aws-8 SUCCESS in 38m 42s
✔️ integration-amazon.aws-9 SUCCESS in 29m 08s
✔️ integration-amazon.aws-10 SUCCESS in 28m 45s
✔️ integration-amazon.aws-11 SUCCESS in 24m 37s
✔️ integration-amazon.aws-12 SUCCESS in 19m 38s
✔️ integration-amazon.aws-13 SUCCESS in 21m 44s
✔️ integration-amazon.aws-14 SUCCESS in 31m 10s
✔️ integration-amazon.aws-15 SUCCESS in 26m 22s
✔️ integration-amazon.aws-16 SUCCESS in 40m 50s
✔️ integration-amazon.aws-17 SUCCESS in 37m 51s
✔️ integration-amazon.aws-18 SUCCESS in 28m 55s
✔️ integration-amazon.aws-19 SUCCESS in 37m 30s
✔️ integration-amazon.aws-20 SUCCESS in 29m 56s
integration-amazon.aws-21 RETRY_LIMIT in 1m 33s
✔️ integration-amazon.aws-22 SUCCESS in 25m 17s
✔️ integration-community.aws-1 SUCCESS in 32m 26s
integration-community.aws-2 RETRY_LIMIT in 1m 29s
✔️ integration-community.aws-3 SUCCESS in 44m 47s
✔️ integration-community.aws-4 SUCCESS in 53m 42s
✔️ integration-community.aws-5 SUCCESS in 22m 32s
integration-community.aws-6 RETRY_LIMIT in 1m 34s
✔️ integration-community.aws-7 SUCCESS in 33m 17s
integration-community.aws-8 RETRY_LIMIT in 1m 36s
✔️ integration-community.aws-9 SUCCESS in 17m 11s
✔️ integration-community.aws-10 SUCCESS in 18m 44s
✔️ integration-community.aws-11 SUCCESS in 22m 01s
✔️ integration-community.aws-12 SUCCESS in 29m 59s
✔️ integration-community.aws-13 SUCCESS in 37m 55s
✔️ integration-community.aws-14 SUCCESS in 8m 32s
✔️ integration-community.aws-15 SUCCESS in 9m 34s
Skipped 7 jobs

@softwarefactory-project-zuul
Copy link
Contributor

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

✔️ ansible-galaxy-importer SUCCESS in 3m 53s
✔️ build-ansible-collection SUCCESS in 13m 21s
✔️ ansible-test-splitter SUCCESS in 5m 04s
✔️ integration-amazon.aws-1 SUCCESS in 26m 20s
✔️ integration-amazon.aws-2 SUCCESS in 20m 26s
✔️ integration-amazon.aws-3 SUCCESS in 21m 03s
✔️ integration-amazon.aws-4 SUCCESS in 23m 14s
✔️ integration-amazon.aws-5 SUCCESS in 31m 22s
✔️ integration-amazon.aws-6 SUCCESS in 15m 22s
✔️ integration-amazon.aws-7 SUCCESS in 45m 58s
✔️ integration-amazon.aws-8 SUCCESS in 36m 32s
✔️ integration-amazon.aws-9 SUCCESS in 29m 16s
✔️ integration-amazon.aws-10 SUCCESS in 27m 19s
✔️ integration-amazon.aws-11 SUCCESS in 21m 19s
✔️ integration-amazon.aws-12 SUCCESS in 18m 20s
✔️ integration-amazon.aws-13 SUCCESS in 18m 32s
✔️ integration-amazon.aws-14 SUCCESS in 36m 38s
✔️ integration-amazon.aws-15 SUCCESS in 21m 16s
✔️ integration-amazon.aws-16 SUCCESS in 40m 33s
✔️ integration-amazon.aws-17 SUCCESS in 29m 08s
✔️ integration-amazon.aws-18 SUCCESS in 18m 59s
✔️ integration-amazon.aws-19 SUCCESS in 38m 16s
integration-amazon.aws-20 FAILURE in 33m 54s
✔️ integration-amazon.aws-21 SUCCESS in 28m 52s
✔️ integration-amazon.aws-22 SUCCESS in 20m 14s
integration-community.aws-1 FAILURE in 53m 44s
✔️ integration-community.aws-2 SUCCESS in 24m 01s
✔️ integration-community.aws-3 SUCCESS in 42m 29s
✔️ integration-community.aws-4 SUCCESS in 37m 23s
✔️ integration-community.aws-5 SUCCESS in 6m 52s
✔️ integration-community.aws-6 SUCCESS in 21m 03s
✔️ integration-community.aws-7 SUCCESS in 30m 04s
✔️ integration-community.aws-8 SUCCESS in 17m 27s
✔️ integration-community.aws-9 SUCCESS in 13m 23s
✔️ integration-community.aws-10 SUCCESS in 18m 24s
✔️ integration-community.aws-11 SUCCESS in 22m 25s
✔️ integration-community.aws-12 SUCCESS in 30m 10s
✔️ integration-community.aws-13 SUCCESS in 40m 50s
✔️ integration-community.aws-14 SUCCESS in 12m 37s
✔️ integration-community.aws-15 SUCCESS in 11m 52s
Skipped 7 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 touches mod utils and kicks off lots of tests

@jillr jillr merged commit 8c0880b into ansible-collections:main May 8, 2023
@tremble tremble deleted the fstring/utils/2 branch September 27, 2023 07:00
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