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

[MIG] [16.0] product sticker #1675

Closed
wants to merge 4 commits into from
Closed

Conversation

Shide
Copy link
Contributor

@Shide Shide commented Jul 1, 2024

Standard migration, added @rafaelbn as a maintainer too.

MT-6566 @moduon @rafaelbn @yajo @fcvalgar @Gelojr please review if you want :)

Shide added 3 commits July 1, 2024 12:37
You can use <t-esc="sticker.note" style="white-space: pre;" /> to display break lines in reports
@fcvalgar
Copy link

fcvalgar commented Jul 1, 2024

Standard migration, nothing changed.

Moduon - Task #6609 @moduon @rafaelbn @yajo @fcvalgar @Gelojr please review if you want :)

Internal task MT-6566

Copy link

@fcvalgar fcvalgar left a comment

Choose a reason for hiding this comment

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

Functional review,

LGTM thank you @Shide

image

Copy link

@Gelojr Gelojr left a comment

Choose a reason for hiding this comment

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

LGTM
image

Copy link
Member

@rafaelbn rafaelbn left a comment

Choose a reason for hiding this comment

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

/ocabot merge patch

@OCA-git-bot
Copy link
Contributor

Sorry @rafaelbn you are not allowed to merge.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@rafaelbn
Copy link
Member

rafaelbn commented Jul 11, 2024

@Shide
Copy link
Contributor Author

Shide commented Jul 11, 2024

@etobella can you review and merge this one? You merge it on v15. Thanks! ❤️

@Shide
Copy link
Contributor Author

Shide commented Jul 15, 2024

@rousseldenis please can you merge this one? I'm the maintainer on v15. Thanks! ❤️

@rafaelbn
Copy link
Member

Hello @OCA/product-maintainers ,

Please could you merge this PR? This is a direct migration from v15 of a module that we are maintainers 😄 :https://github.com/OCA/product-attribute/blob/15.0/product_sticker/__manifest__.py#L21

Standard migration, added @rafaelbn as a maintainer too.

We have also pending [MIG][16.0] stock_picking_report_product_sticker wich depends on this one!

Thank you! ❤️ 🙏🏼

@yajo
Copy link
Member

yajo commented Jul 25, 2024

@Shide you're the maintainer in v15:

"maintainers": ["Shide"],

Please try to issue the merge command yourself. The bot should obey you if you're the previous version maintainer.

@Shide
Copy link
Contributor Author

Shide commented Jul 25, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

Sorry @Shide you are not allowed to merge.

To do so you must either have push permissions on the repository, or be a declared maintainer of all modified addons.

If you wish to adopt an addon and become it's maintainer, open a pull request to add your GitHub login to the maintainers key of its manifest.

@rafaelbn
Copy link
Member

Please @gurneyalex @legalsylvain could you please make a quick review here and merge? 🙏🏼 This is a direct migration of a module that we are maintainers 😄 ❤️

@HaraldPanten
Copy link

@Shide Aren't you mixing the pre-commit changes with the migration commit?

@Shide
Copy link
Contributor Author

Shide commented Jul 29, 2024

@HaraldPanten Yes, I'm mixing it because pre-commit doesn't give us relevant information

@etobella
Copy link
Member

@Shide pre-commit may not give relevant information, but simplifies review, it exists for reviewers 😉. Next time try to follow OCA rules please

@HaraldPanten
Copy link

@HaraldPanten Yes, I'm mixing it because pre-commit doesn't give us relevant information

Hi Shide. I know, but pre-commit message has to be separate from migration. If you do it, I'll merge your PR ASAP 👍

@yajo
Copy link
Member

yajo commented Jul 30, 2024

Hi folks. When splitting the pre-commit commit, there's something you have to take into account. When the contributor changes the version or maintainers in the manifest, just doing git commit will rewrite the README. That's the thing that's happening here. This is because the README generator takes the manifest into account when deciding if it should update the README.

A very different thing is when, before doing that, the contributor just runs pre-commit run -a and saves those automated reformats in a separate commit. However, that's not something applicable to this PR because if you do that before changing anything, there won't be any changes anyways.

In short, if you follow the recommended steps, you'll end up with a PR exactly like this one. Therefore, it's ready to merge.

@pedrobaeza
Copy link
Member

That's not true, @yajo. If you follow the guide you have linked (which is the official OCA guide for this), you end up with 2 commits, not one. The flag --no-verify on the commit command for the pre-commit auto-fixes makes that no additional changes are required to be done in the first commit due to linters.

If you want to change the current OCA guidelines, please raise an issue or mail on the usual channels to ask for that change. Meanwhile, you must follow the procedure and put the 2 commits, so @HaraldPanten's claim is totally legit.

@HaraldPanten
Copy link

Hi folks. When splitting the pre-commit commit, there's something you have to take into account. When the contributor changes the version or maintainers in the manifest, just doing git commit will rewrite the README. That's the thing that's happening here. This is because the README generator takes the manifest into account when deciding if it should update the README.

A very different thing is when, before doing that, the contributor just runs pre-commit run -a and saves those automated reformats in a separate commit. However, that's not something applicable to this PR because if you do that before changing anything, there won't be any changes anyways.

In short, if you follow the recommended steps, you'll end up with a PR exactly like this one. Therefore, it's ready to merge.

Hi Jairo, @rafaelbn @Shide My only point here is trying to help you to move forward with this PR. All migrations are separating pre-commit stuff vs migration commit. That's why I asked you to do that.

You can see that we are doing this as well in every migration we do:

OCA/timesheet#701
OCA/project#1319
OCA/web#2897
...

Once done, I'll merge this module. 🤙

@HaraldPanten
Copy link

/ocabot migration product_sticker

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Jul 30, 2024
@OCA-git-bot OCA-git-bot mentioned this pull request Jul 30, 2024
55 tasks
@Shide
Copy link
Contributor Author

Shide commented Jul 30, 2024

@HaraldPanten I promise next migration PRs won't merge the pre-commit message.

But, I'm the maintainer and no one has modified this module in v15, so the commit author has been respected.

I don't see any point to make me work more undoing a migration and make it again to have the same result.

I promise again in the next migration PRs won't merge the pre-commit message, but for now, I think it's enough work for that PR series.

Thanks in advance!

@HaraldPanten
Copy link

@HaraldPanten I promise next migration PRs won't merge the pre-commit message.

But, I'm the maintainer and no one has modified this module in v15, so the commit author has been respected.

I don't see any point to make me work more undoing a migration and make it again to have the same result.

I promise again in the next migration PRs won't merge the pre-commit message, but for now, I think it's enough work for that PR series.

Thanks in advance!

Hi @Shide I'm not sure if I understood you well.

As far as I know, this is a standard migration. The only change is that you're adding Rafa as a maintainer. That's OK.

But... Why is it a problem to run pre-commit and have separate changes (pre-commit vs migration) in different commits?

It's not about me (or my rules), it's because everybody is doing the same in all OCA. And I'm asking these changes in every Migration PR I review. Please, have a look at --> OCA/account-financial-tools#1819 (comment)

@Shide Shide closed this Jul 31, 2024
@Shide Shide deleted the 16.0-mig-product_sticker branch July 31, 2024 07:13
@Shide
Copy link
Contributor Author

Shide commented Jul 31, 2024

Closed in favor of #1698

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants