Skip to content

[15.0][MIG] web_widget_mermaid#2763

Open
dreispt wants to merge 10 commits intoOCA:15.0from
ursais:TheRealRoboHeart-15.0-mig-web_widget_mermaid
Open

[15.0][MIG] web_widget_mermaid#2763
dreispt wants to merge 10 commits intoOCA:15.0from
ursais:TheRealRoboHeart-15.0-mig-web_widget_mermaid

Conversation

@dreispt
Copy link
Member

@dreispt dreispt commented Mar 9, 2024

Supersedes #2308

Using the last official version of module web_widget_mermaid as a base
for the migration to v15.0
Using new asset definition via manifest and changed from static
mermaid.js file to external CDN.
Removed web_widget_mermaid_default_theme.scss and
web_widget_mermaid_view.xml from mainfest (detailed description in
upcoming commits)
This file is no longer needed since assets are now defined in
manifest file.
Fixed ESLint messages. Due to issue with mermaid call, the definition
has been moved to init and was deactivated for rule 'no-undef'.
Inline comments has been moved to additional lines.
Since it seems like null values are no longer working for theme
parameter, theme has been set to 'base' and theme config can completely
move to web_widget_mermaid.js.
web_widget_mermaid_default_theme.scss will be removed in upcoming
commit.
SCSS file of default theme can be removed since the theme config moved
to web_widget_mermaid.js.
• Add contributor: RoboHeart
• Remove 'Upgrading' section from USAGE.rst

[ADD] Missing setup files

[UPD] Documentation files

by oca-gen-addon-readme
@dreispt
Copy link
Member Author

dreispt commented Mar 9, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-2763-by-dreispt-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Mar 9, 2024
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@dreispt The merge process could not be finalized, because command /tmp/tmp43e738b6/bin/python setup.py bdist_wheel --dist-dir /tmp/tmppjq7bw95 --bdist-dir /tmp/tmp5a2mi6an --python-tag py3 failed with output:

/tmp/tmp43e738b6/lib/python3.8/site-packages/setuptools_scm/_integration/setuptools.py:30: RuntimeWarning: 
ERROR: setuptools==57.5.0 is used in combination with setuptools_scm>=8.x

Your build configuration is incomplete and previously worked by accident!
setuptools_scm requires setuptools>=61

Suggested workaround if applicable:
 - migrating from the deprecated setup_requires mechanism to pep517/518
   and using a pyproject.toml to declare build dependencies
   which are reliably pre-installed before running the build tools

  warnings.warn(
error in setup command: /tmp/tmpnbue9nxg/setup/web_widget_mermaid/odoo/addons must contain exactly one installable Odoo addon dir, found []

@dreispt
Copy link
Member Author

dreispt commented Mar 9, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-2763-by-dreispt-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request Mar 9, 2024
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@dreispt The merge process could not be finalized, because command /tmp/tmp43e738b6/bin/python setup.py bdist_wheel --dist-dir /tmp/tmpjzp8d1px --bdist-dir /tmp/tmpdmfjrn_p --python-tag py3 failed with output:

/tmp/tmp43e738b6/lib/python3.8/site-packages/setuptools_scm/_integration/setuptools.py:30: RuntimeWarning: 
ERROR: setuptools==57.5.0 is used in combination with setuptools_scm>=8.x

Your build configuration is incomplete and previously worked by accident!
setuptools_scm requires setuptools>=61

Suggested workaround if applicable:
 - migrating from the deprecated setup_requires mechanism to pep517/518
   and using a pyproject.toml to declare build dependencies
   which are reliably pre-installed before running the build tools

  warnings.warn(
error in setup command: /tmp/tmp3afsumew/setup/web_widget_mermaid/odoo/addons must contain exactly one installable Odoo addon dir, found []

@dreispt
Copy link
Member Author

dreispt commented May 16, 2024

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

What a great day to merge this nice PR. Let's do it!
Prepared branch 15.0-ocabot-merge-pr-2763-by-dreispt-bump-nobump, awaiting test results.

OCA-git-bot added a commit that referenced this pull request May 16, 2024
Signed-off-by dreispt
@OCA-git-bot
Copy link
Contributor

@dreispt The merge process could not be finalized, because command /tmp/tmpnjquwd9s/bin/python setup.py bdist_wheel --dist-dir /tmp/tmpkm2hwieq --bdist-dir /tmp/tmp3hzqrm89 --python-tag py3 failed with output:

/tmp/tmpnjquwd9s/lib/python3.8/site-packages/setuptools_scm/_integration/setuptools.py:30: RuntimeWarning: 
ERROR: setuptools==57.5.0 is used in combination with setuptools_scm>=8.x

Your build configuration is incomplete and previously worked by accident!
setuptools_scm requires setuptools>=61

Suggested workaround if applicable:
 - migrating from the deprecated setup_requires mechanism to pep517/518
   and using a pyproject.toml to declare build dependencies
   which are reliably pre-installed before running the build tools

  warnings.warn(
error in setup command: /tmp/tmpee_c8pj3/setup/web_widget_mermaid/odoo/addons must contain exactly one installable Odoo addon dir, found []

@idamonli
Copy link

@dreispt Do you have plans to migrate this module to version 16.0?

@bosd
Copy link
Contributor

bosd commented May 27, 2024

Would like to test this, but runboat is not available :(

@hbrunn
Copy link
Member

hbrunn commented Jul 18, 2025

/ocabot rebase

@OCA-git-bot
Copy link
Contributor

@hbrunn The rebase process failed, because command git rebase origin/15.0 failed with output:

Rebasing (1/9)
Rebasing (2/9)
Rebasing (3/9)
Rebasing (4/9)
Rebasing (5/9)
Rebasing (6/9)
Rebasing (7/9)
Rebasing (8/9)
Rebasing (9/9)
Auto-merging .copier-answers.yml
CONFLICT (content): Merge conflict in .copier-answers.yml
Auto-merging .gitignore
Auto-merging .pre-commit-config.yaml
CONFLICT (content): Merge conflict in .pre-commit-config.yaml
error: could not apply ddea6a9db... [REF] pre-commit: copier update
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply ddea6a9db... [REF] pre-commit: copier update

Copy link
Contributor

@bosd bosd left a comment

Choose a reason for hiding this comment

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

This does not seem to be working:
image

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants