Fix usage of installed poetry version in CI

This commit is contained in:
Ethan Paul 2021-12-04 12:49:15 -05:00
parent c05187f2e6
commit 17a2e5af64
No known key found for this signature in database
GPG Key ID: D0E2CBF1245E92BF

View File

@ -12,10 +12,10 @@ set -e;
# Set global vars for usage in the script, create the cache directory so we can rely # Set global vars for usage in the script, create the cache directory so we can rely
# on that existing, then dump some diagnostic info for later reference. # on that existing, then dump some diagnostic info for later reference.
# #
PATH="$PATH:$HOME/.local/bin"
CI_VENV=$HOME/ci; CI_VENV=$HOME/ci;
CI_CACHE=$HOME/.cache; CI_CACHE=$HOME/.cache;
CI_CACHE_GET_POETRY="$CI_CACHE/get-poetry.py"; CI_CACHE_GET_POETRY="$CI_CACHE/get-poetry.py";
CI_POETRY=$HOME/.poetry/bin/poetry;
CI_VENV_PIP="$CI_VENV/bin/pip"; CI_VENV_PIP="$CI_VENV/bin/pip";
CI_VENV_PIP_VERSION=19.3.1; CI_VENV_PIP_VERSION=19.3.1;
CI_VENV_TOX="$CI_VENV/bin/tox"; CI_VENV_TOX="$CI_VENV/bin/tox";
@ -37,7 +37,7 @@ curl https://install.python-poetry.org \
--location; --location;
python "$CI_CACHE_GET_POETRY" --yes 1>/dev/null; python "$CI_CACHE_GET_POETRY" --yes 1>/dev/null;
python "$CI_POETRY" --version --no-ansi; poetry --version --no-ansi;
# ##### Setup Runtime Venv ##### # ##### Setup Runtime Venv #####
# #
@ -58,7 +58,7 @@ $CI_VENV_PIP install "pip==$CI_VENV_PIP_VERSION" \
--upgrade \ --upgrade \
--quiet; --quiet;
VIRTUAL_ENV=$CI_VENV "$CI_POETRY" install \ VIRTUAL_ENV=$CI_VENV poetry install \
--extras poetry \ --extras poetry \
--quiet \ --quiet \
--no-ansi \ --no-ansi \