account-financial-tools icon indicating copy to clipboard operation
account-financial-tools copied to clipboard

[MIG] account_cost_center: Migration to 15.0

Open smemon786 opened this issue 2 years ago • 6 comments

smemon786 avatar Apr 29 '22 09:04 smemon786

@aisopuro Please review it.

smemon786 avatar Apr 29 '22 09:04 smemon786

Hello, thanks for contributing. Please make sure you follow the guideline in order to migrate https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-15.0#technical-method-to-migrate-a-module-from-140-to-150-branch

kittiu avatar May 17 '22 03:05 kittiu

@kittiu + @aisopuro this module is ready to merge.

smemon786 avatar May 31 '22 07:05 smemon786

Hello, thanks for contributing. Please make sure you follow the guideline in order to migrate https://github.com/OCA/maintainer-tools/wiki/Migration-to-version-15.0#technical-method-to-migrate-a-module-from-140-to-150-branch

@kittiu, this module is ready to merge, please have a look.

smemon786 avatar May 31 '22 07:05 smemon786

@smemon786 it seems this PR is only 1 commit, but I suspect it should be several, in order to maintain the original history of the module.

The link you've added is for migrating a module that existed in 14.0 to 15.0. But it looks like account_cost_center hasn't been in the repo since version 12.0.

I think you need to adapt the commands you linked to use branch 12.0 where they refer to 14.0. That way you'll retain the proper git history of the module.

I basically think the first set of commands should be

$ git clone https://github.com/OCA/$REPO -b 15.0
$ cd $REPO
$ git checkout -b 15.0-mig-$MODULE origin/15.0
$ git format-patch --keep-subject --stdout origin/15.0..origin/12.0 -- $MODULE | git am -3 --keep
$ pre-commit run -a  # to run black, isort and prettier (ignore pylint errors at this stage)
$ git add -A
$ git commit -m "[IMP] $MODULE: black, isort, prettier"  --no-verify  # it is important to do all formatting in one commit the first time

aisopuro avatar May 31 '22 08:05 aisopuro

@smemon786 it seems this PR is only 1 commit, but I suspect it should be several, in order to maintain the original history of the module.

The link you've added is for migrating a module that existed in 14.0 to 15.0. But it looks like account_cost_center hasn't been in the repo since version 12.0.

I think you need to adapt the commands you linked to use branch 12.0 where they refer to 14.0. That way you'll retain the proper git history of the module.

I basically think the first set of commands should be

$ git clone https://github.com/OCA/$REPO -b 15.0
$ cd $REPO
$ git checkout -b 15.0-mig-$MODULE origin/15.0
$ git format-patch --keep-subject --stdout origin/15.0..origin/12.0 -- $MODULE | git am -3 --keep
$ pre-commit run -a  # to run black, isort and prettier (ignore pylint errors at this stage)
$ git add -A
$ git commit -m "[IMP] $MODULE: black, isort, prettier"  --no-verify  # it is important to do all formatting in one commit the first time

@aisopuro, please review now.

smemon786 avatar May 31 '22 09:05 smemon786

Could you please @kittiu check and merge it?

anikeenko-viktor avatar Nov 03 '22 12:11 anikeenko-viktor

@TheerayutEncoder can you help test?

kittiu avatar Nov 03 '22 15:11 kittiu

OK, I will test this PR tomorrow. For make sure it work properly in v15! @kittiu

TheerayutEncoder avatar Nov 03 '22 16:11 TheerayutEncoder

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

OCA-git-bot avatar Nov 06 '22 15:11 OCA-git-bot

Hi @kittiu, could you please merge this one?

anikeenko-viktor avatar Nov 22 '22 12:11 anikeenko-viktor

/ocabot merge nobump

kittiu avatar Nov 22 '22 15:11 kittiu

Hey, thanks for contributing! Proceeding to merge this for you. Prepared branch 15.0-ocabot-merge-pr-1384-by-kittiu-bump-nobump, awaiting test results.

OCA-git-bot avatar Nov 22 '22 15:11 OCA-git-bot

Congratulations, your PR was merged at 41c0a10294f186a5f17c61f6ec863195cd9cb7b1. Thanks a lot for contributing to OCA. ❤️

OCA-git-bot avatar Nov 22 '22 15:11 OCA-git-bot