From f3a5bc9399590cb65b6d9fc665e4a9d21ee8cf46 Mon Sep 17 00:00:00 2001 From: Mathieu Benoit Date: Fri, 7 Jul 2023 01:04:38 -0400 Subject: [PATCH] [UPD] multilingual-markdown: update to last version v1.0.3 --- Makefile | 2 +- doc/CODE_GENERATOR.base.md | 4 ++++ doc/CODE_GENERATOR.md | 2 ++ docker/Dockerfile.prod.pkg | 6 ------ poetry.lock | 18 +++++++++++++++++- pyproject.toml | 1 + requirements.txt | 1 + script/install/install_locally.sh | 10 ---------- 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 5cd1719..55a30e3 100644 --- a/Makefile +++ b/Makefile @@ -1190,4 +1190,4 @@ doc_clean_user: # documentation markdown .PHONY: doc_markdown doc_markdown: - ./.venv/multilang_md.py $(shell pwd)/doc/CODE_GENERATOR.base.md + ./.venv/bin/mmg --verbose --yes ./doc/CODE_GENERATOR.base.md diff --git a/doc/CODE_GENERATOR.base.md b/doc/CODE_GENERATOR.base.md index 5e0598e..f48942d 100644 --- a/doc/CODE_GENERATOR.base.md +++ b/doc/CODE_GENERATOR.base.md @@ -77,6 +77,8 @@ make run_code_generator Générateur de code avec fonctionnalités avancées : + +TODO ```bash make addons_install_code_generator_featured @@ -85,6 +87,8 @@ make run_code_generator Générateur de code avec fonctionnalités complètes : + +TODO ```bash make addons_install_code_generator_full diff --git a/doc/CODE_GENERATOR.md b/doc/CODE_GENERATOR.md index 908e1da..d55049a 100644 --- a/doc/CODE_GENERATOR.md +++ b/doc/CODE_GENERATOR.md @@ -24,11 +24,13 @@ make addons_install_code_generator_basic make run_code_generator ``` +TODO ```bash make addons_install_code_generator_featured make run_code_generator ``` +TODO ```bash make addons_install_code_generator_full make run_code_generator diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index 1e6c33b..e1ca391 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -45,12 +45,6 @@ RUN cd $ODOO_PREFIX && \ ./.venv/bin/poetry --version && \ ./.venv/bin/poetry install -RUN cd $ODOO_PREFIX/.venv && \ - curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ./multilang_md.py && \ - chmod +x ./multilang_md.py && \ - sed -i 1d ./multilang_md.py && \ - sed -i "1 i #!./.venv/bin/python" ./multilang_md.py - RUN cd $ODOO_PREFIX && \ head /etc/odoo/odoo.conf && \ ./docker/repo_manifest_gen_org_prefix_path.py $ODOO_PREFIX/addons /etc/odoo/odoo.conf /etc/odoo/odoo.conf && \ diff --git a/poetry.lock b/poetry.lock index cf127ec..5da97ea 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2016,6 +2016,22 @@ files = [ {file = "mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325"}, ] +[[package]] +name = "mmg" +version = "1.0.3" +description = "Command Line Interface to Generate i18n Markdown" +category = "main" +optional = false +python-versions = ">=3.6, <4" +files = [ + {file = "mmg-1.0.3-py3-none-any.whl", hash = "sha256:00f9a17ede9262ab90f04b17574b0168265a261b2891d0c3fc7f79786b941d0b"}, + {file = "mmg-1.0.3.tar.gz", hash = "sha256:2a7d1e67589850273db904dc0a1ffc11348ed7e88b458c84a54909283d7e7f12"}, +] + +[package.dependencies] +click = ">=7.1.2" +emoji = ">=0.6.0" + [[package]] name = "mock" version = "2.0.0" @@ -5853,4 +5869,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.7.16" -content-hash = "f708624b9c9470c14fadb74f15b61ba72e1d637a3be936a3aa36601b8b84182c" +content-hash = "09686cf272f3fa469be683dca2bf7511127c34ee36260dcf8031fca1f0a8c254" diff --git a/pyproject.toml b/pyproject.toml index bb34198..63ac098 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,6 +78,7 @@ libsass = "0.12.3" lxml = "4.9.1" mako = "1.2.2" markupsafe = "0.23" +mmg = "^1.0.3" mock = "2.0.0" mpld3 = "^0.5.9" mysqlclient = "2.1.1" diff --git a/requirements.txt b/requirements.txt index ac64ae4..0db1768 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,6 +8,7 @@ openupgradelib unidiff colorama wheel +mmg # For OSX cython diff --git a/script/install/install_locally.sh b/script/install/install_locally.sh index 69c057b..0e415d0 100755 --- a/script/install/install_locally.sh +++ b/script/install/install_locally.sh @@ -95,16 +95,6 @@ fi # Make .venv active -# Install Multilingual Markdown Generator if missing -if [[ ! -f ${VENV_MULTILINGUAL_MARKDOWN_PATH} ]]; then - echo "\n---- Install Multilingual Markdown Generator ----" - curl https://raw.githubusercontent.com/ERPLibre/multilingual-markdown/master/multilang_md.py > ${VENV_MULTILINGUAL_MARKDOWN_PATH} - chmod +x ${VENV_MULTILINGUAL_MARKDOWN_PATH} - sed -i 1d ${VENV_MULTILINGUAL_MARKDOWN_PATH} - PYTHON_HASHBANG="#!./.venv/bin/python" - sed -i "1 i ${PYTHON_HASHBANG}" ${VENV_MULTILINGUAL_MARKDOWN_PATH} -fi - echo -e "\n---- Installing poetry dependency ----" ${VENV_PATH}/bin/pip install --upgrade pip # Force python instead of changing env