# HG changeset patch # User Vincent Hatakeyama <vincent.hatakeyama@xcg-consulting.fr> # Date 1664450776 -7200 # Thu Sep 29 13:26:16 2022 +0200 # Node ID 09d9dd3fedd1c59d3552b5edfc5ba0a48e48eb62 # Parent eeeaf06efcb50b0e54f1f6229b6058cb66c9cbdf ✨ prettier for Odoo 11 diff --git a/NEWS.rst b/NEWS.rst --- a/NEWS.rst +++ b/NEWS.rst @@ -2,6 +2,11 @@ History ======= +16.8.0 +------ + +Prettier for odoo 11. + 16.7.3 ------ diff --git a/odoo_scripts/docker_prettier.py b/odoo_scripts/docker_prettier.py --- a/odoo_scripts/docker_prettier.py +++ b/odoo_scripts/docker_prettier.py @@ -6,14 +6,14 @@ import os import sys -from .config import Config +from .config import ODOO_11, Config from .docker_build import add_build_options, build_local_image, get_build_options from .docker_client import DockerClient from .parsing import apply, basic_parser -__version__ = "1.0.1" +__version__ = "1.1.0" __date__ = "2022-02-17" -__updated__ = "2022-03-03" +__updated__ = "2022-09-29" _logger = logging.getLogger(__name__) @@ -72,7 +72,14 @@ """Run prettier""" config = Config() - build_local_image(build_options) + if config.odoo_type == ODOO_11: + image = "quay.orus.io/xcgd/prettier" + tag = "2.5.1" + else: + # Only works on Odoo 13+ where prettier is in the image + build_local_image(build_options) + image = config.local_image + tag = config.local_tag pwd = os.environ["PWD"] path = os.path.abspath(os.path.join(pwd, directory)) @@ -97,8 +104,8 @@ _logger.info("Running prettier in %s", path) return DockerClient.run( - config.local_image, - config.local_tag, + image, + tag, { "entrypoint": "prettier", "user": os.getuid(),