summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/auto.yml2
-rwxr-xr-xdev.sh22
2 files changed, 15 insertions, 9 deletions
diff --git a/.github/workflows/auto.yml b/.github/workflows/auto.yml
index 81d4673..da23a58 100644
--- a/.github/workflows/auto.yml
+++ b/.github/workflows/auto.yml
@@ -27,7 +27,7 @@ jobs:
# Install dependencies
- name: Install dev dependencies
- run: ./dev.sh dev
+ run: PIP="pip" ./dev.sh dev
# Run coverage xml
- name: Run unittests with coverage and generate xml
diff --git a/dev.sh b/dev.sh
index 29633c5..e5b0a37 100755
--- a/dev.sh
+++ b/dev.sh
@@ -15,15 +15,16 @@ covxml Sama mutta xml muoto (codecov tarvitsee tämän)
covff Tee html haarakattavuusraportti ja avaa se firefoxissa
all Sama kuin '$0 covff && $0 pylint'
install Rakenna ja asenna paketti käyttäen pipx & poetry
-uninstall Poistaa paketin (pipx uninstall...)
" && exit 0
+[ x$PIP = x ] && PIP="pipx"
+
echo "\033[32m>>> $0 $1 - started.\033[0m"
case $1 in
install-poetry)
- pipx install poetry
+ $PIP install poetry
;;
poetry-dev-deps)
@@ -67,14 +68,19 @@ case $1 in
&& $0 pylint
;;
- install)
- pipx install poetry \
- && poetry build \
- && pipx install `ls dist/*.tar.gz -t -c -1 | head -1`
+ poetry-build)
+ poetry build
+ ;;
+
+ install-latest-build)
+ $PIP install `ls dist/*.tar.gz -t -c -1 | head -1` \
+ && echo "For uninstall please use '$PIP uninstall ...'"
;;
- uninstall)
- pipx uninstall miinaharava
+ install)
+ $0 install-poetry \
+ && $0 poetry-build \
+ && $0 install-latest-build
;;
*)