diff --git a/CHANGELOG.md b/CHANGELOG.md index db87f5a..f4848f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.5.0] - 2023-07-07 + **Migration note** Because new update of Python and Poetry, recreate virtual environment. @@ -34,16 +36,26 @@ Do a backup of your database and update all module : - Makefile can generate image DB in parallel with `image_db_create_all_parallel` - Makefile can run all code_generator with `run_parallel_cg` and `run_parallel_cg_template` - Script to generate Pycharm configuration and exclude directory +- Support docker alpha+beta +- Limit memory execution when install in develop +- Template nginx configuration +- Script code count statistic +- Script show OCA evolution module statistic +- Windows development support, check documentation installation +- New project (code generator to create module) support params configuration +- Module sync_external_model to synchronise Odoo models with module ## Changed -- Odoo 12.0 update from 22-07-2020 to 10-10-2022 +- Odoo 12.0 update from 22-07-2020 to 01-01-2023 - Update pip dependency with security update - Pillow==9.3.0 - - gitpython==3.1.29 - psycopg2==2.9.5 + - Werkzeug==0.16.1 + - check diff of file pyproject.toml for all information - Update to Python==3.7.16 - Update poetry==1.3.1 +- Update multilingual-markdown==1.0.3 - Update imagedb with all Odoo update - Repo documentation-user from Odoo change to documentation - Repo odooaktiv/QuotationRevision is deleted @@ -51,10 +63,16 @@ Do a backup of your database and update all module : - Rename module project_task_subtask_time_range => project_time_budget - Rename module project_task_time_range => project_time_range - Refactor script emplacement, create directory in ./script/ per subject +- Use command parallel in Makefile +- Update sphinx version +- Improve script location ### Fixed - Debian 11 installation script +- Test result +- OSX installation (not finish to support) +- Poetry update support '~=' ### Removed @@ -68,6 +86,8 @@ Do a backup of your database and update all module : - Module helpdesk_mailing_list - Module helpdesk_join_team - Module project_time_management +- Support of vatnumber, too old +- Deprecated python dependency like pycrypto ## [1.4.0] - 2022-10-05 @@ -383,7 +403,9 @@ Because addons repository has change, config file need to be updated. - Support only python3.6 and python3.7, python3.8 causes error in runtime. -[Unreleased]: https://github.com/ERPLibre/ERPLibre/compare/v1.4.0...HEAD +[Unreleased]: https://github.com/ERPLibre/ERPLibre/compare/v1.5.0...HEAD + +[1.5.0]: https://github.com/ERPLibre/ERPLibre/compare/v1.4.0...v1.5.0 [1.4.0]: https://github.com/ERPLibre/ERPLibre/compare/v1.3.0...v1.4.0 diff --git a/Makefile b/Makefile index 5cd1719..1d6b2aa 100644 --- a/Makefile +++ b/Makefile @@ -403,8 +403,8 @@ image_db_create_erplibre_package_wiki: .PHONY: image_db_create_erplibre_package_dms image_db_create_erplibre_package_dms: -# ./.venv/bin/python3 ./odoo/odoo-bin db --drop --database image_creation_erplibre_package_dms -# ./.venv/bin/python3 ./odoo/odoo-bin db --clone --from_database image_creation_erplibre_base --database image_creation_erplibre_package_dms + ./.venv/bin/python3 ./odoo/odoo-bin db --drop --database image_creation_erplibre_package_dms + ./.venv/bin/python3 ./odoo/odoo-bin db --clone --from_database image_creation_erplibre_base --database image_creation_erplibre_package_dms ./script/addons/install_addons.sh image_creation_erplibre_package_dms muk_dms,muk_dms_access,muk_dms_view,muk_web_preview,muk_web_preview_audio,muk_web_preview_csv,muk_web_preview_image,muk_web_preview_markdown,muk_web_preview_msoffice,muk_web_preview_opendocument,muk_web_preview_rst,muk_web_preview_text,muk_web_preview_video ./.venv/bin/python3 ./odoo/odoo-bin db --backup --database image_creation_erplibre_package_dms --restore_image erplibre_package_dms @@ -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/README.md b/README.md index 83a6df4..fdd79e4 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ First, install dependencies to run docker, check script `./script/install/instal The docker volume is bound to the directory name, therefore create a unique directory name and run: ```bash -wget https://raw.githubusercontent.com/ERPLibre/ERPLibre/v1.4.0/docker-compose.yml +wget https://raw.githubusercontent.com/ERPLibre/ERPLibre/v1.5.0/docker-compose.yml docker-compose up -d ``` diff --git a/default.xml b/default.xml index ab7872b..19dba3f 100644 --- a/default.xml +++ b/default.xml @@ -26,140 +26,140 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - + + 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/doc/RELEASE.md b/doc/RELEASE.md index 7407d56..13f6892 100644 --- a/doc/RELEASE.md +++ b/doc/RELEASE.md @@ -85,7 +85,7 @@ To generate database images in directory `./image_db`, run: ```bash make db_clean_cache make config_gen_all -make image_db_create_all +make image_db_create_all_parallel ``` To test it, you need to clean caches and install it: diff --git a/docker-compose.yml b/docker-compose.yml index d6fbf2b..04c40f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: "3.3" services: ERPLibre: - image: technolibre/erplibre:1.4.0 + image: technolibre/erplibre:1.5.0 ports: - 8069:8069 - 8071:8071 diff --git a/docker/Dockerfile.prod.pkg b/docker/Dockerfile.prod.pkg index 1e6c33b..8c2c33c 100644 --- a/docker/Dockerfile.prod.pkg +++ b/docker/Dockerfile.prod.pkg @@ -1,4 +1,4 @@ -FROM technolibre/erplibre-base:1.4.0 +FROM technolibre/erplibre-base:1.5.0 ENV REPO_MANIFEST_URL https://github.com/ERPLibre/ERPLibre ARG WORKING_BRANCH @@ -39,18 +39,10 @@ RUN cd $ODOO_PREFIX && \ # Install Poetry RUN cd $ODOO_PREFIX && \ ./.venv/bin/pip install --upgrade pip && \ - ./.venv/bin/pip install vatnumber && \ - ./.venv/bin/pip install suds-jurko && \ ./.venv/bin/pip install poetry==1.3.1 && \ ./.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/docker/repo_manifest_gen_org_prefix_path.py b/docker/repo_manifest_gen_org_prefix_path.py index 01b323a..e60054b 100755 --- a/docker/repo_manifest_gen_org_prefix_path.py +++ b/docker/repo_manifest_gen_org_prefix_path.py @@ -24,8 +24,7 @@ addonsDirs = [abspath(join(addonsBaseDir, f)) for f in listdir(addonsBaseDir) if isdir(join(addonsBaseDir, f))] # addonsDirs.insert(0, "/usr/lib/python3/dist-packages/odoo/addons/") -# TODO path addons/addons is not exist in docker, so force to add it -# addonsDirs.insert(0, "/ERPLibre/addons/addons") +addonsDirs.insert(0, "/ERPLibre/addons/addons") addonsDirs.insert(0, "/ERPLibre/odoo/addons/") config = configparser.ConfigParser() diff --git a/env_var.sh b/env_var.sh index 8fb9428..a23bfa6 100755 --- a/env_var.sh +++ b/env_var.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -ERPLIBRE_VERSION="1.4.0" +ERPLIBRE_VERSION="1.5.0" EL_USER="erplibre" EL_HOME="/${EL_USER}" diff --git a/poetry.lock b/poetry.lock index cf127ec..9d6c35e 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" @@ -2406,6 +2422,18 @@ files = [ [package.dependencies] decorator = "*" +[[package]] +name = "odoorpc" +version = "0.9.0" +description = "OdooRPC is a Python package providing an easy way to pilot your Odoo servers through RPC." +category = "main" +optional = false +python-versions = "*" +files = [ + {file = "OdooRPC-0.9.0-py2.py3-none-any.whl", hash = "sha256:95a0d40c94c76a097870379a411180f81da164917a27d891a935894105f46704"}, + {file = "OdooRPC-0.9.0.tar.gz", hash = "sha256:936adc52871b4c9d6b921c73421acd88f73442b17a71a49f34de6dbcf54d7964"}, +] + [[package]] name = "ofxparse" version = "0.16" @@ -5853,4 +5881,4 @@ files = [ [metadata] lock-version = "2.0" python-versions = "^3.7.16" -content-hash = "f708624b9c9470c14fadb74f15b61ba72e1d637a3be936a3aa36601b8b84182c" +content-hash = "e3d80bd8df1d6e0f9b0234ad53565bc66f98a0b77952743e4a237283fe19b1fe" diff --git a/pyproject.toml b/pyproject.toml index bb34198..3994319 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -12,7 +12,7 @@ target-version = [ "py37",] [tool.poetry] name = "ERPLibre" -version = "1.4.0" +version = "1.5.0" description = "Easy way to configure Odoo community" license = "AGPL-3.0-or-later" authors = [ "Mathieu Benoit ",] @@ -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" @@ -85,6 +86,7 @@ num2words = "0.5.6" numpy = "1.21.1" oauthlib = "2.1.0" oca-decorators = "^0.0.1" +odoorpc = "^0.9.0" ofxparse = "0.16" openpyxl = "^3.1.2" openupgradelib = "^3.4.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 eb4fa6a..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 @@ -119,8 +109,8 @@ if [[ ! -f "${POETRY_PATH}" ]]; then ${VENV_PATH}/bin/pip install poetry==${POETRY_VERSION} ${VENV_PATH}/bin/poetry --version # Fix broken poetry by installing ignored dependence - ${VENV_PATH}/bin/pip install vatnumber - ${VENV_PATH}/bin/pip install suds-jurko + # ${VENV_PATH}/bin/pip install vatnumber + # ${VENV_PATH}/bin/pip install suds-jurko # ${VENV_PATH}/bin/poetry lock --no-update ${VENV_PATH}/bin/poetry install retVal=$? diff --git a/script/install/install_locally_dev.sh b/script/install/install_locally_dev.sh index bfe9f12..98dfbcb 100755 --- a/script/install/install_locally_dev.sh +++ b/script/install/install_locally_dev.sh @@ -17,16 +17,16 @@ if [[ $retVal -ne 0 ]]; then exit 1 fi -# Install maintainer-tools -cd script/OCA_maintainer-tools || exit -# virtualenv is not installed by default -#virtualenv env -../../.venv/bin/python -m venv env -. env/bin/activate -pip install setuptools-rust -# Delete all tag before installing, or break installation, will generate a new one after -git tag | xargs git tag -d -python setup.py install -git tag ERPLibre/v1.4.0 -#${VENV_PATH}/bin/pip install ./script/OCA_maintainer-tools/ -cd - +## Install maintainer-tools +#cd script/OCA_maintainer-tools || exit +## virtualenv is not installed by default +##virtualenv env +#../../.venv/bin/python -m venv env +#. env/bin/activate +#pip install setuptools-rust +## Delete all tag before installing, or break installation, will generate a new one after +#git tag | xargs git tag -d +#python setup.py install +#git tag ERPLibre/v1.4.0 +##${VENV_PATH}/bin/pip install ./script/OCA_maintainer-tools/ +#cd -