On 10/13/22 03:49, Eggert Ehmke wrote:
pip install --upgrade git+https://gitlab.com/mailman/hyperkitty@master
I noticed that mistune-2.0.0rc1 was upgraded to mistune-2.0.4.
All packages were upgraded fine. I applied the patch to venv/lib/python3.9/site-packages/hyperkitty/lib/renderer.py
It shouldn't have been necessary to apply any patch. The head of the GitLab hyperkitty master branch is already compatible with mistune 2.0.4
to change the mistune import line. When I run now mailman-web migrate I get: *CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0017_auto_20220628_1132, 0018_alter_emailtemplate_language in postorius).* *To fix them run 'python manage.py makemigrations --merge'*
However, when I run the suggested command as: $ python ./venv/lib/python3.9/site-packages/mailman_web/manage.py makemigrations -- merge No conflicts detected to merge.
There's something strange here. If you look at the migrations at the head of the gitlab branch at https://gitlab.com/mailman/postorius/-/tree/master/src/postorius/migrations, you'll see that migration 17 is named 0017_alter_emailtemplate_language.py, not 0017_auto_20220628_1132.
I suggest comparing the content of your postorius/migrations/ directory with the GitLab head and resolving any differences.
Can I just ignore this behavior? At the moment, I don't dare to carry out these steps on my production system. Would be nice to shed some light on this.
I'm guessing at some point you installed something which required you to manually make this migration and that produced this conflict. Do you have both 0017_alter_emailtemplate_language.py and 0017_auto_20220628_1132 in your postorius/migrations/ directory? If so, probably just removing 0017_auto_20220628_1132 will fix this?
-- Mark Sapiro <mark@msapiro.net> The highway is for gamblers, San Francisco Bay Area, California better use your sense - B. Dylan