[UPD] poetry: update 1.1.14 to 1.3.1

.gitignore

@@ -22,3 +22,4 @@ image_db
 get-poetry.py
 artifacts
 wkhtmltox*
+cache

CHANGELOG.md

@@ -7,6 +7,14 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+**Migration note**
+
+- Delete poetry at path `~/.poetry` and `./get-poetry.py`, and rerun installation dev with `make install_dev`
+
+## Changed
+
+- Update poetry==1.3.1
+
 ## [1.4.0] - 2022-10-05
 
 **Migration note**

doc/POETRY.md

@@ -26,3 +26,11 @@ poetry add PYTHON_MODULE
 
 If you got this error `relative path can't be expressed as a file URI` when executing poetry, delete directory
 artifacts: `rm -rf artifacts/` and rerun the update.
+
+## Upgrade Poetry
+
+Change version in file `./script/install_locally.sh` into constant `POETRY_VERSION`.
+
+Erase directory `~/.poetry` and `./get-poetry.py`.
+
+Run installation script for OS, check `./script/install_locally.sh`.

ignore_requirements.txt

@@ -17,3 +17,5 @@ swiftclient
 u2flib_server
 voicent
 xlsxwriter
+suds-jurko
+vatnumber

pyproject.toml

@@ -68,7 +68,7 @@ emoji = "^2.1.0"
 escpos = "^1.9"
 extract-msg = "^0.36.4"
 factur-x = "^2.3"
-feedparser = "5.2.1"
+feedparser = "6.0.10"
 flake8 = "^5.0.4"
 formio-data = "^0.4.6"
 freezegun = "0.3.11"
@@ -126,7 +126,6 @@ pyproj = "3.2.1"
 pyserial = "3.1.1"
 pysftp = "^0.2.9"
 python-chess = "<0.24"
-python-csv = "^0.0.13"
 python-dateutil = "2.7.3"
 python-git = "^2018.2.1"
 python-json-logger = "0.1.5"
@@ -154,13 +153,11 @@ sphinx-intl = "^2.0.1"
 sphinx-patchqueue = ">=1.0"
 sphinx-rtd-theme = "^1.0.0"
 statsd = "3.2.1"
-suds-jurko = "0.6"
 toml = "^0.10.2"
 tornado = "6.1"
 twython = "^3.9.1"
 unidiff = "^0.7.4"
 urllib3 = "1.26.8"
-vatnumber = "1.2"
 vcrpy = ">=2.1.1"
 vcrpy-unittest = "^0.1.7"
 vobject = "0.9.3"

requirements.txt

@@ -27,8 +27,6 @@ factur-x
 websocket-client
 python-stdnum
 python-u2flib_server
-python-dateutil
-python-csv
 python-chess
 python-git
 voicent-python
@@ -75,6 +73,7 @@ zipp>=3.6.0
 # Force update dependency to fix poetry
 # numpy >=1.22 is not compatible with python 3.7
 numpy==1.21.1
+feedparser==6.0.10
 
 # Solve pcodedmp, oletools, rtfde and extract-msg
 win_unicode_console

script/install_locally.sh

@@ -28,12 +28,13 @@ PYENV_PATH=~/.pyenv
 PYTHON_VERSION=3.7.12
 PYENV_VERSION_PATH=${PYENV_PATH}/versions/${PYTHON_VERSION}
 PYTHON_EXEC=${PYENV_VERSION_PATH}/bin/python
-POETRY_PATH=~/.poetry
 VENV_PATH=./.venv
 LOCAL_PYTHON_EXEC=${VENV_PATH}/bin/python
 VENV_REPO_PATH=${VENV_PATH}/repo
 VENV_MULTILINGUAL_MARKDOWN_PATH=${VENV_PATH}/multilang_md.py
-POETRY_VERSION=1.1.14
+#POETRY_PATH=~/.local/bin/poetry
+POETRY_PATH=${VENV_PATH}/bin/poetry
+POETRY_VERSION=1.3.1
 
 echo "Python path version home"
 echo ${PYENV_VERSION_PATH}
@@ -76,13 +77,12 @@ if [[ ! -d ${VENV_PATH} ]]; then
     fi
 fi
 
-if [[ ! -d "${POETRY_PATH}" ]]; then
+#if [[ ! -d "${POETRY_PATH}" ]]; then
-    # Delete directory ~/.poetry and .venv to force update to new version
+#    # Delete directory ~/.poetry and .venv to force update to new version
-    echo -e "\n---- Installing poetry for reliable python package ----"
+#    echo -e "\n---- Installing poetry ${LOCAL_PYTHON_EXEC} for reliable python package ----"
-#     curl -sSL https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py | ${PYTHON_EXEC}
+#    # TODO self update poetry with `poetry self update ${POETRY_VERSION}`
-    curl -fsS -o get-poetry.py https://raw.githubusercontent.com/python-poetry/poetry/master/get-poetry.py
+#    curl -sSL https://install.python-poetry.org | POETRY_VERSION=${POETRY_VERSION} ${LOCAL_PYTHON_EXEC} - -y
-    ${LOCAL_PYTHON_EXEC} get-poetry.py -y --preview --version ${POETRY_VERSION}
+#fi
-fi
 
 # Install git-repo if missing
 if [[ ! -f ${VENV_REPO_PATH} ]]; then
@@ -110,11 +110,23 @@ ${VENV_PATH}/bin/pip install --upgrade pip
 #/home/"${USER}"/.poetry/bin/poetry env use ${LOCAL_PYTHON_EXEC}
 # source $HOME/.poetry/env
 #${LOCAL_PYTHON_EXEC} ~/.poetry/bin/poetry env use ${VENV_PATH}/bin/python3
-${LOCAL_PYTHON_EXEC} ~/.poetry/bin/poetry install
+#${LOCAL_PYTHON_EXEC} ~/.poetry/bin/poetry install
-retVal=$?
+#${POETRY_PATH} install
-if [[ $retVal -ne 0 ]]; then
+
-    echo "Poetry installation error."
+# Delete artifacts created by pip, cause error in next "poetry install"
-    exit 1
+if [[ ! -f "${POETRY_PATH}" ]]; then
+    ${VENV_PATH}/bin/pip install poetry==${POETRY_VERSION}
+    ${VENV_PATH}/bin/poetry --version
+    ${VENV_PATH}/bin/poetry lock --no-update
+    ${VENV_PATH}/bin/poetry install
+    retVal=$?
+    if [[ $retVal -ne 0 ]]; then
+        echo "Poetry installation error."
+        exit 1
+    fi
+    # Fix broken poetry by installing ignored dependence
+    ${VENV_PATH}/bin/pip install vatnumber
+    ${VENV_PATH}/bin/pip install suds-jurko
 fi
 # Delete artifacts created by pip, cause error in next "poetry install"
 rm -rf artifacts