diff --git a/.python-version b/.python-version index d2577d9..f7e5aa8 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.7.7 +3.7.12 diff --git a/doc/DEVELOPMENT.md b/doc/DEVELOPMENT.md index b4df330..af10163 100644 --- a/doc/DEVELOPMENT.md +++ b/doc/DEVELOPMENT.md @@ -197,6 +197,16 @@ source ./.venv/bin/activate python odoo/odoo-bin scaffold MODULE_NAME addons/REPO_NAME/ ``` +## Python version + +Your actual version is in file .python-version. Use script `./script/version/change_python_version.sh 3.7.12` to change to version 3.7.12 . + +Run the installation, `make install_dev`. + +Update poetry, `./script/poetry_update.py`. + +Create docker, `make docker_build`. + # Pull request ## Show all pull requests from organization diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index f6e408a..10fd213 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -1,4 +1,4 @@ -FROM python:3.7.7-slim-buster +FROM python:3.7.12-slim-buster MAINTAINER TechnoLibre SHELL ["/bin/bash", "-xo", "pipefail", "-c"] diff --git a/docker/python-versions.txt b/docker/python-versions.txt index cbbb5ee..b44c537 100644 --- a/docker/python-versions.txt +++ b/docker/python-versions.txt @@ -1 +1 @@ -3.7.7 \ No newline at end of file +3.7.12 \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 76db0fe..e1c71d2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,7 +10,7 @@ license = "AGPL-3.0-or-later" authors = [ "Mathieu Benoit ",] [tool.poetry.dependencies] -python = "^3.7.7" +python = "^3.7.12" Asterisk = "^0.0.8" Babel = "2.3.4" BeautifulSoup4 = "^4.10.0" diff --git a/script/install_OSX_dependency.sh b/script/install_OSX_dependency.sh index 61756db..1340d9b 100755 --- a/script/install_OSX_dependency.sh +++ b/script/install_OSX_dependency.sh @@ -37,8 +37,8 @@ sudo npm install -g rtlcss sudo npm install -g less sudo npm install -g prettier sudo npm install -g prettier @prettier/plugin-xml -yes n|pyenv install 3.7.7 -pyenv local 3.7.7 +yes n|pyenv install 3.7.12 +pyenv local 3.7.12 echo 'export PATH="/usr/local/opt/openssl@1.1/bin:$PATH"' >> ~/.zshrc diff --git a/script/install_locally.sh b/script/install_locally.sh index 9cf672d..a728292 100755 --- a/script/install_locally.sh +++ b/script/install_locally.sh @@ -25,7 +25,7 @@ if [[ ! -d "./addons/addons" ]]; then fi PYENV_PATH=~/.pyenv -PYTHON_VERSION=3.7.7 +PYTHON_VERSION=3.7.12 PYENV_VERSION_PATH=${PYENV_PATH}/versions/${PYTHON_VERSION} PYTHON_EXEC=${PYENV_VERSION_PATH}/bin/python POETRY_PATH=~/.poetry diff --git a/script/version/change_python_version.sh b/script/version/change_python_version.sh new file mode 100755 index 0000000..eadaf5c --- /dev/null +++ b/script/version/change_python_version.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# $1 new version version, like 3.7.12 + +input=".python-version" +while IFS= read -r line +do + echo -e "Actual version $line" + sed -i -e "s/$line/$1/g" ./.python-version + sed -i -e "s/$line/$1/g" ./docker/Dockerfile.base + sed -i -e "s/$line/$1/g" ./docker/python-versions.txt + sed -i -e "s/$line/$1/g" ./script/install_locally.sh + sed -i -e "s/$line/$1/g" ./script/install_OSX_dependency.sh + sed -i -e "s/$line/$1/g" ./pyproject.toml +done < "$input" + +while IFS= read -r line +do + echo -e "New version $line" +done < "$input"