From 56925cdabd2fc6dc8bc2738303a45f41a40a43df Mon Sep 17 00:00:00 2001 From: Janik von Rotz Date: Thu, 5 Dec 2024 08:43:28 +0100 Subject: [PATCH] feat: sync from 17.0 --- .git-reset-files | 2 +- requirements.txt | 6 +++--- task | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.git-reset-files b/.git-reset-files index b178aab0..60745665 100644 --- a/.git-reset-files +++ b/.git-reset-files @@ -1,3 +1,3 @@ snippets -templates +template scripts \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index b6297975..c87d1c9f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ pre-commit pyyaml -docutils -rst2html5 odoorpc coverage pylint-odoo pytest==7.4.4 pytest-odoo -manifestoo \ No newline at end of file +manifestoo +rst2html5==2.0.1 +docutils==0.21.2 \ No newline at end of file diff --git a/task b/task index e97681ef..b904fd51 100755 --- a/task +++ b/task @@ -626,15 +626,15 @@ function install-native() { exit 1 fi - echo "Install Odoo development tools" - pip install setuptools wheel ${PIP_INOTIFY} watchdog - pip install -r requirements.txt - echo "Install Odoo dependencies" pip install -r odoo/requirements.txt echo "Configure Odoo as python package" pip install -e odoo + + echo "Install Odoo development tools" + pip install setuptools wheel ${PIP_INOTIFY} watchdog + pip install -r requirements.txt } # Process Commands @@ -1146,7 +1146,7 @@ function lint-module() { find "$1" -type f -exec chmod u=rw,go=r {} \; echo "Update index.html" - rst2html5.py "$1/README.rst" "$1/static/description/index.html" + rst2html5 "$1/README.rst" "$1/static/description/index.html" pushd . cd "$1"