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

[15.0][l10n_br_base] unf*uck the 15.0 branch #3493

Open
rvalyi opened this issue Nov 14, 2024 · 4 comments
Open

[15.0][l10n_br_base] unf*uck the 15.0 branch #3493

rvalyi opened this issue Nov 14, 2024 · 4 comments
Labels

Comments

@rvalyi
Copy link
Member

rvalyi commented Nov 14, 2024

TLDR : YES, YOU NEED TO CLONE THE OCA/l10n-brazil 15.0 BRANCH AGAIN!

Same problem and same process as for the 16.0 branch here

This is time the list of commits that were exclusively present in the 15.0 branch is shorter:

git cherry-pick a90c39dd3d74c6b3aa797186f8444ca0085b0c84  # [ADD] setup.py
git cherry-pick 8a96f209c0a1f992f0a971a069ee28b8364ce0c9  # [MIG][l10n_br_base] bump module version 15.0.1.0.0
git cherry-pick d1c67648a8cbfef4908975336225b13b6f9e859e  # [MIG] To new assets format
git cherry-pick b40fb382cea23a00228ed470d55a90687d2c60cc  # [REF] l10n_br_base res.config view
git cherry-pick f61a149c4bfbf443495bf1360d12e28049133598  # remove warnings: db odoo.tools.convert: HTML field 'signature' is declared as type=xml
git cherry-pick 9f39270ad7de3c65532f419a37344671edac719a  # remove warning: The model odoo.addons.l10n_br_base.models.res_partner_pix is not overriding the create method in batch
git cherry-pick c833ab3158195ec8da761cb5d6ee4212fd175f1d  # l10n_br_base: removed warning: Deprecated class SavepointCase has been merged into TransactionCase
git cherry-pick e8cac2e567561c15a8dfe36f6d988191578d481a  # l10n_br_base 15.0.1.0.1
git cherry-pick 108645d9e7d62e4f7d0df17d548d4074a4cbfc97  # trivial fix
git cherry-pick 85ebb482998ff76ce0c77d7049bebe6ebf8ddc65  # [REMOVE] folder migration #2788
git cherry-pick a80ee33fc207241a3e1e1546fd3ff3b123f8eb03  # Merge PR #2788 into 15.0
git cherry-pick f891dc40b6f489c769b6c8c59334c31db89f8872  # [FIX] l10n_br_base: Rename assets_backend file to avoid error.

The new fixed 15.0 branch is here 15.0-mig-l10n_br_base while I also saved a backup 15.0 branch here

@renatonlima @marcelsavegnago @antoniospneto podem testar essa nova branch para ver se podemos fazer o force push dela na 15.0 do OCA/l10n-brazil ?

@rvalyi
Copy link
Member Author

rvalyi commented Nov 14, 2024

reparam os ~500+ commits a mais que tavam faltando na 15.0:

2024-11-14_20-11

2024-11-14_20-12

@rvalyi
Copy link
Member Author

rvalyi commented Nov 15, 2024

@renatonlima @marcelsavegnago @antoniospneto acabei de dar um force push na nova branch 15.0 15.0-mig-l10n_br_base porque tinha 2 pequenos probleminhas de pre-commit no arquivos l10n_br_base/tests/test_valid_createid.py e requirements.txt. Dei amend nos 2 commits (da lista de cherry-picks) e fiz o push. Rodei os testes com successo localemente, porem eu agora tenho esse novo warning:


2024-11-15 14:26:54,671 8986 WARNING odoo15 py.warnings: /home/rvalyi/DEV/odoo15/odoo/src/odoo/fields.py:746: UserWarning: Field res.partner.vat should be declared with recursive=True
  File "/home/rvalyi/DEV/odoo15/odoo/bin/odoo", line 7, in <module>
    exec(compile(f.read(), __file__, 'exec'))
  File "/home/rvalyi/DEV/odoo15/odoo/src/setup/odoo", line 8, in <module>
    odoo.cli.main()
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/cli/command.py", line 61, in main
    o.run(args)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/cli/server.py", line 179, in run
    main(args)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/cli/server.py", line 173, in main
    rc = odoo.service.server.start(preload=preload, stop=stop)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/service/server.py", line 1356, in start
    rc = server.run(preload, stop)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/service/server.py", line 557, in run
    rc = preload_registries(preload)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/service/server.py", line 1260, in preload_registries
    registry = Registry.new(dbname, update_module=update_module)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/modules/registry.py", line 87, in new
    odoo.modules.load_modules(registry, force_demo, status, update_module)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/modules/loading.py", line 470, in load_modules
    processed_modules += load_marked_modules(cr, graph,
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/modules/loading.py", line 363, in load_marked_modules
    loaded, processed = load_module_graph(
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/modules/loading.py", line 199, in load_module_graph
    registry.init_models(cr, model_names, {'module': package.name}, new_install)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/modules/registry.py", line 440, in init_models
    func()
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/addons/base/models/ir_model.py", line 45, in mark_modified
    records.modified(fnames)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/models.py", line 6036, in modified
    node = self.pool.field_triggers.get(self._fields[fname])
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/tools/func.py", line 26, in __get__
    value = self.fget(obj)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/modules/registry.py", line 338, in field_triggers
    dependencies[field] = OrderedSet(field.resolve_depends(self))
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/tools/misc.py", line 1085, in __init__
    self._map = dict.fromkeys(elems)
  File "/home/rvalyi/DEV/odoo15/odoo/src/odoo/fields.py", line 746, in resolve_depends
    warnings.warn(f"Field {self} should be declared with recursive=True")

Isso provavelmente esta devido ao port do PR de refator do CNPJ/vat #2718 do @marcelsavegnago que agora ficou presente nessa bova branch 15.0. Eu ainda não analisei a criticidade disso...

Vou fazer os mesmos testes e ajustes na 16.0 agora...

@marcelsavegnago
Copy link
Member

@rvalyi nós da Escodoo não temos nenhum projeto na 15.0 e portanto o impacto seria em algum PR nossa mas não vejo problema.

@rvalyi
Copy link
Member Author

rvalyi commented Nov 28, 2024

@marcelsavegnago @antoniospneto @mbcosta @mileo @DiegoParadeda @douglascstd fizemos o force push da branch 15.0 ontem então.

Nisso o Github fechou automaticamente os PR's em curso que usavam a branch 15.0 com o historico quebrado como base, se trata desses PR's na 15.0:

Na Akretion a gente não liga muito para a branch 15.0 agora. Era melhor consertar a 15.0 caso alguém usa ou passa a usar depois (sempre tem algum maluco que foi se lascar num projeto com parceiro oficial da vez e leva 2 anos para cair na real e voltar para a OCA...), mas nosso foco vai ser mais na 16.0 e nas versões superiores. Alguns desses PRs foram propostas aqui como etapa intermediarias ou para ajudar mas nem todos eles tinham vocação a entrar na 15.0, pelo menos não da parte de quem os fez. Mas enfim caso alguns deles precisam ser re-criados, a principio seria apenas fazer um novo PR com os cherry-picks dos PR's em cima de um fork da branch 15.0 de agora (com os histórico consertado).

@rvalyi rvalyi added bug and removed enhancement labels Nov 30, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants