diff --git a/NEWS.rst b/NEWS.rst index eeeaf06efcb50b0e54f1f6229b6058cb66c9cbdf_TkVXUy5yc3Q=..09d9dd3fedd1c59d3552b5edfc5ba0a48e48eb62_TkVXUy5yc3Q= 100644 --- 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 index eeeaf06efcb50b0e54f1f6229b6058cb66c9cbdf_b2Rvb19zY3JpcHRzL2RvY2tlcl9wcmV0dGllci5weQ==..09d9dd3fedd1c59d3552b5edfc5ba0a48e48eb62_b2Rvb19zY3JpcHRzL2RvY2tlcl9wcmV0dGllci5weQ== 100644 --- a/odoo_scripts/docker_prettier.py +++ b/odoo_scripts/docker_prettier.py @@ -6,8 +6,8 @@ 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 @@ -10,6 +10,6 @@ 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" @@ -15,5 +15,5 @@ __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(),