precommit: yapf by Borda · Pull Request #5494 · ultralytics/yolov5

Borda · 2021-11-03T23:55:46Z

use YAPF as default codebase formatting
Resolves #4983
Alternative to, closes #5490

This PR defines YAPF as pre-commit hook and lets the bot fix it... rabbit

🛠️ PR Summary

_{Made with ❤️ by Ultralytics Actions}

🌟 Summary

Code improvements and bug fixes to enhance YOLOv5's functionalities.

📊 Key Changes

🧹 Cleaned up code by enabling yapf formatting in .pre-commit-config.yaml.
✨ Improved detect.py function definitions for better readability.
🎨 Reformatted export.py for readability and standardized export formats.
💅 Applied consistent style improvements to the codebase, such as line breaks and indentation.
🛠 Fixed minor issues within the code files like hubconf.py, models/common.py, and models/experimental.py.

🎯 Purpose & Impact

👀 These changes make the code more readable and maintainable.
🐛 Bug fixes prevent unexpected behavior and facilitate seamless development and deployment.
🔨 Enabling yapf formatting in the pre-commit workflow ensures consistent code style automatically, preventing style-related issues in future contributions.

setup.cfg

Borda · 2021-11-05T10:28:20Z

well seems that the ISORT and YAPF configuration yield in inconsistent imports formatting 😕

glenn-jocher · 2021-11-05T11:19:33Z

@Borda yes I see that also :(

Borda · 2021-11-09T14:35:11Z

yes I see that also :(

ok, found and motion which works for both - 5 - Hanging Grid Grouped

from third_party import (
    lib1, lib2, lib3, lib4,
    lib5, ...
)

@glenn-jocher mind checking if this is fine with you? :]

Borda · 2021-11-19T16:25:53Z

@glenn-jocher @kalenmike can we merge this one? :]

Borda · 2021-12-07T19:48:21Z

@glenn-jocher I would rather go with multi_line_output=5 as it is more readable, the 0 is so strange...

Borda · 2021-12-07T21:33:31Z

I would add Thoughts on Why Code Formatting is even more important for Open-Source

Borda · 2021-12-21T18:28:51Z

@glenn-jocher resolved conflicts, so shall be ready to go... 🐰

Borda · 2022-01-02T15:15:45Z

@glenn-jocher any update on this format cleaning PR? 😕

Borda · 2022-01-12T22:33:06Z

@glenn-jocher pls ping 🐰 ^^

Borda · 2022-01-17T22:06:50Z

@glenn-jocher Happy New Year 🎉

Borda · 2022-01-31T16:28:43Z

@glenn-jocher all resolved, I may suggest getting it to merge and you can experiment with other formations in a follow-up PR? :)

Borda · 2022-02-05T00:52:34Z

@glenn-jocher all shall be fixed now 🐰

Borda · 2022-02-08T18:45:20Z

@glenn-jocher still an ongoing discussion? 🐰

Borda · 2022-02-11T09:48:32Z

@glenn-jocher never-ending resolving conflicts become quite annoying... 😕

# Conflicts: # utils/plots.py

for more information, see https://pre-commit.ci

glenn-jocher · 2022-03-28T16:53:18Z

@Borda ok I think I have a good set of yapf arguments now. PyCharm reformat accepts the yapf reformat without conflicts.

Borda · 2022-03-28T17:45:43Z

ok I think I have a good set of yapf arguments now. PyCharm reformat accepts the yapf reformat without conflicts.

perfect!

for more information, see https://pre-commit.ci

…/yapf

glenn-jocher · 2022-03-31T15:07:59Z

@Borda PR is merged. Thank you for your contributions to YOLOv5 🚀 and Vision AI ⭐

* precommit: yapf * align isort * fix # Conflicts: # utils/plots.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update setup.cfg * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update setup.cfg * Update setup.cfg * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update wandb_utils.py * Update augmentations.py * Update setup.cfg * Update yolo.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update val.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * simplify colorstr * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * val run fix * export.py last comma * Update export.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update hubconf.py * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * PyTorch Hub tuple fix * PyTorch Hub tuple fix2 * PyTorch Hub tuple fix3 * Update setup Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Glenn Jocher <glenn.jocher@ultralytics.com>

Borda force-pushed the pre-commit/yapf branch from ec2ebe4 to 622cc9e Compare November 4, 2021 00:02

Borda marked this pull request as ready for review November 4, 2021 00:03

Borda marked this pull request as draft November 4, 2021 00:03

Borda force-pushed the pre-commit/yapf branch 2 times, most recently from 622cc9e to 630b3db Compare November 4, 2021 00:09

Borda mentioned this pull request Nov 4, 2021

precommit: Black #5490

Closed

Borda marked this pull request as ready for review November 4, 2021 08:35

Borda commented Nov 4, 2021

View reviewed changes

setup.cfg Outdated Show resolved Hide resolved

Borda force-pushed the pre-commit/yapf branch from d7d777b to 8039fad Compare November 4, 2021 20:49

glenn-jocher assigned Borda Nov 5, 2021

Borda force-pushed the pre-commit/yapf branch 2 times, most recently from 48f6980 to f78ff51 Compare November 9, 2021 14:33

Borda force-pushed the pre-commit/yapf branch from 087cb4f to ec80d20 Compare February 21, 2022 12:00

Borda added 3 commits March 10, 2022 14:27

precommit: yapf

24bef33

align isort

ec8d311

fix

091e30a

# Conflicts: # utils/plots.py

glenn-jocher and others added 5 commits March 28, 2022 18:21

Update setup.cfg

433d44f

[pre-commit.ci] auto fixes from pre-commit.com hooks

ae470a5

for more information, see https://pre-commit.ci

Update wandb_utils.py

35043c0

Update augmentations.py

477bf5e

Update setup.cfg

22e599c

glenn-jocher and others added 18 commits March 31, 2022 13:18

Merge branch 'master' into pre-commit/yapf

87a0d8f

Update yolo.py

87d7c25

[pre-commit.ci] auto fixes from pre-commit.com hooks

e367c21

for more information, see https://pre-commit.ci

Update val.py

e8e704f

[pre-commit.ci] auto fixes from pre-commit.com hooks

e38a19c

for more information, see https://pre-commit.ci

simplify colorstr

145b4e6

[pre-commit.ci] auto fixes from pre-commit.com hooks

add8115

for more information, see https://pre-commit.ci

val run fix

4748c82

export.py last comma

24f4c48

Update export.py

9f1252d

[pre-commit.ci] auto fixes from pre-commit.com hooks

4d876b1

for more information, see https://pre-commit.ci

Update hubconf.py

e17f628

[pre-commit.ci] auto fixes from pre-commit.com hooks

c549671

for more information, see https://pre-commit.ci

PyTorch Hub tuple fix

a265e98

Merge remote-tracking branch 'origin/pre-commit/yapf' into pre-commit…

ee53b01

…/yapf

PyTorch Hub tuple fix2

fc00278

PyTorch Hub tuple fix3

6e6cbee

Update setup

fd67a03

glenn-jocher merged commit c3d5ac1 into ultralytics:master Mar 31, 2022

Borda deleted the pre-commit/yapf branch March 31, 2022 16:16

hojland mentioned this pull request Oct 17, 2022

feat/bump Go-Autonomous/yolov5#15

Merged

Uh oh!

Conversation

Borda commented Nov 3, 2021 • edited by UltralyticsAssistant Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🛠️ PR Summary

🌟 Summary

📊 Key Changes

🎯 Purpose & Impact

Uh oh!

Uh oh!

Borda commented Nov 5, 2021

Uh oh!

glenn-jocher commented Nov 5, 2021

Uh oh!

Borda commented Nov 9, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Borda commented Nov 19, 2021

Uh oh!

Borda commented Dec 7, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Borda commented Dec 7, 2021

Uh oh!

Borda commented Dec 21, 2021

Uh oh!

Borda commented Jan 2, 2022

Uh oh!

Borda commented Jan 12, 2022

Uh oh!

Borda commented Jan 17, 2022

Uh oh!

Borda commented Jan 31, 2022

Uh oh!

Borda commented Feb 5, 2022

Uh oh!

Borda commented Feb 8, 2022

Uh oh!

Borda commented Feb 11, 2022

Uh oh!

glenn-jocher commented Mar 28, 2022

Uh oh!

Borda commented Mar 28, 2022

Uh oh!

glenn-jocher commented Mar 31, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Borda commented Nov 3, 2021 •

edited by UltralyticsAssistant

Loading

Borda commented Nov 9, 2021 •

edited

Loading

Borda commented Dec 7, 2021 •

edited

Loading