Merge branch 'develop' into 3.0/poetry

This commit is contained in:
Ondrej Samohel 2021-02-05 19:49:39 +01:00
commit dda74bbf05
No known key found for this signature in database
GPG key ID: 02376E18990A97C6
35 changed files with 430 additions and 284 deletions

View file

@ -117,7 +117,7 @@ echo -e "${RST}"
detect_python || return 1
# Directories
pype_root=$(dirname $(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))))
pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))
pushd "$pype_root" > /dev/null || return > /dev/null
version_command="import os;exec(open(os.path.join('$pype_root', 'pype', 'version.py')).read());print(__version__);"

View file

@ -126,7 +126,7 @@ main () {
detect_python || return 1
# Directories
pype_root=$(dirname $(realpath $(dirname $(dirname "${BASH_SOURCE[0]}"))))
pype_root=$(realpath $(dirname $(dirname "${BASH_SOURCE[0]}")))
pushd "$pype_root" > /dev/null || return > /dev/null
echo -e "${BIGreen}>>>${RST} Reading Poetry ... \c"