diff --git a/CHANGELOG.md b/CHANGELOG.md index c051d58..7191de2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # Release Notes +## Release 1.5.0 (2023-11-16) + +### Added + +- Experimental support of Odoo 17.0 + +--- + ## Release 1.4.0 (2023-11-08) ### Added diff --git a/README.md b/README.md index 2cf06c1..e18b6b9 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,7 @@ The canonical source of odoo-helper-scripts is hosted on [GitLab](https://gitlab - *14.0* - *15.0* - *16.0* + - *17.0* (**Experimental**) - OS support: - On *Ubuntu* should work nice (auto tested on *Ubuntu 20.04, 22.04*) - Also should work on *Debian* based systems, but some troubles may happen with installation of system dependencies. diff --git a/docs/index.md b/docs/index.md index d5ba212..b05969e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -94,6 +94,7 @@ please, read carefully [Usage notes](#usage-note) section. - *14.0* - *15.0* - *16.0* + - *17.0* (**Experimental**) - OS support: - On *Ubuntu* should work nice - Also should work on *Debian* based systems, but some troubles may happen with installation of system dependencies. diff --git a/lib/install.bash b/lib/install.bash index af22e0e..4e060b6 100644 --- a/lib/install.bash +++ b/lib/install.bash @@ -438,7 +438,12 @@ function install_sys_deps_for_odoo_version { local control_url="https://raw.githubusercontent.com/odoo/odoo/$odoo_branch/debian/control"; local tmp_control; tmp_control=$(mktemp); - wget -q -T 15 "$control_url" -O "$tmp_control"; + + if ! wget -q -T 15 "$control_url" -O "$tmp_control"; then + echoe -e "${REDC}ERROR${NC}: Cannot download debian control file from '$control_url'!"; + return 2; + fi + local sys_deps; mapfile -t sys_deps < <(ODOO_VERSION="$odoo_version" install_parse_debian_control_file "$tmp_control"); install_sys_deps_internal "${sys_deps[@]}"; @@ -698,6 +703,8 @@ function install_build_python_guess_version { echo "3.8.13"; elif [ -n "$ODOO_VERSION" ] && [ "$(odoo_get_major_version)" -eq 16 ]; then echo "3.8.13"; + elif [ -n "$ODOO_VERSION" ] && [ "$(odoo_get_major_version)" -eq 17 ]; then + echo "3.10.13"; else echoe -e "${REDC}ERROR${NC}: Automatic detection of python version for odoo ${ODOO_VERSION} is not supported!"; return 1; diff --git a/lib/odoo.bash b/lib/odoo.bash index d90857a..b877ecb 100644 --- a/lib/odoo.bash +++ b/lib/odoo.bash @@ -289,6 +289,8 @@ function odoo_ensure_python_version { ${python_interpreter} -c "import sys; assert (3, 7) <= sys.version_info < (3, 11);"; elif [ -n "$ODOO_VERSION" ] && [ "$(odoo_get_major_version)" -eq 16 ]; then ${python_interpreter} -c "import sys; assert (3, 7) <= sys.version_info < (3, 11);"; + elif [ -n "$ODOO_VERSION" ] && [ "$(odoo_get_major_version)" -eq 17 ]; then + ${python_interpreter} -c "import sys; assert sys.version_info > (3, 10);"; else echoe -e "${REDC}ERROR${NC}: Automatic detection of python version for odoo ${ODOO_VERSION} is not supported!"; return 1; diff --git a/lib/version.bash b/lib/version.bash index 86fc9a9..159c087 100644 --- a/lib/version.bash +++ b/lib/version.bash @@ -9,5 +9,5 @@ # Odoo Helper Scripts: Version # Define version number -ODOO_HELPER_VERSION="1.4.0"; +ODOO_HELPER_VERSION="1.5.0"; ODOO_HELPER_CONFIG_VERSION="1"; diff --git a/tests/test.bash b/tests/test.bash index 6614e89..474deef 100755 --- a/tests/test.bash +++ b/tests/test.bash @@ -983,54 +983,54 @@ odoo-helper db drop odoo16-odoo-test; #================================= #${NC}" -#cd ../; +cd ../; -## Remove odoo 17 -## this is needed to bypass gitlab.com limitation of disk space for CI jobs -#rm -rf ./odoo-16.0 +# Remove odoo 17 +# this is needed to bypass gitlab.com limitation of disk space for CI jobs +rm -rf ./odoo-16.0 -## Install odoo 17 -#odoo-helper install sys-deps -y 17.0; +# Install odoo 17 +odoo-helper install sys-deps -y 17.0; -#odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \ - #--http-port 8569 --http-host local-odoo-16 \ - #--db-user odoo16 --db-pass odoo --create-db-user \ - #--build-python-if-needed +odoo-install --install-dir odoo-17.0 --odoo-version 17.0 \ + --http-port 8569 --http-host local-odoo-17 \ + --db-user odoo17 --db-pass odoo --create-db-user \ + --build-python-if-needed -#cd odoo-17.0; +cd odoo-17.0; -## Install py-tools and js-tools -#odoo-helper install py-tools; -#odoo-helper install js-tools; +# Install py-tools and js-tools +odoo-helper install py-tools; +odoo-helper install js-tools; -#odoo-helper server run --stop-after-init; # test that it runs +odoo-helper server run --stop-after-init; # test that it runs -## Show project status -#odoo-helper status; -#odoo-helper server status; -#odoo-helper start; -#odoo-helper ps; -#odoo-helper status; -#odoo-helper server status; -#odoo-helper stop; +# Show project status +odoo-helper status; +odoo-helper server status; +odoo-helper start; +odoo-helper ps; +odoo-helper status; +odoo-helper server status; +odoo-helper stop; -## Show complete odoo-helper status -#odoo-helper status --tools-versions --ci-tools-versions; +# Show complete odoo-helper status +odoo-helper status --tools-versions --ci-tools-versions; -## Database management -#odoo-helper db create --tdb --lang en_US; +# Database management +odoo-helper db create --tdb --lang en_US; -#odoo-helper addons update-list --tdb; -#odoo-helper addons install --tdb --module crm; -#odoo-helper addons test-installed crm; +odoo-helper addons update-list --tdb; +odoo-helper addons install --tdb --module crm; +odoo-helper addons test-installed crm; -#odoo-helper lsd; # List databases +odoo-helper lsd; # List databases -### Install addon website via 'odoo-helper install' -#odoo-helper install website; +## Install addon website via 'odoo-helper install' +odoo-helper install website; -## Drop created databases -#odoo-helper db drop odoo17-odoo-test; +# Drop created databases +odoo-helper db drop odoo17-odoo-test; echo -e "${YELLOWC}