Skip to content
Snippets Groups Projects
Commit 2e8a66a6 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch 'master' into 'master'

Replace Poetry Build system test with more posix version

Closes #79

See merge request to-be-continuous/python!113
parents be7fd568 95056049
No related branches found
No related tags found
No related merge requests found
...@@ -630,7 +630,7 @@ variables: ...@@ -630,7 +630,7 @@ variables:
} }
function maybe_install_poetry() { function maybe_install_poetry() {
if [[ "$PYTHON_BUILD_SYSTEM" =~ ^poetry.* ]] && ! command -v poetry > /dev/null if [[ "$PYTHON_BUILD_SYSTEM" =~ ^poetry ]] && ! command -v poetry > /dev/null
then then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
pip install ${PIP_OPTS} "$PYTHON_BUILD_SYSTEM" pip install ${PIP_OPTS} "$PYTHON_BUILD_SYSTEM"
...@@ -684,7 +684,7 @@ variables: ...@@ -684,7 +684,7 @@ variables:
} }
function _run() { function _run() {
if [[ "$PYTHON_BUILD_SYSTEM" == poetry* ]] if [[ "$PYTHON_BUILD_SYSTEM" =~ ^poetry ]]
then then
maybe_install_poetry maybe_install_poetry
poetry run "$@" poetry run "$@"
...@@ -703,7 +703,7 @@ variables: ...@@ -703,7 +703,7 @@ variables:
} }
function py_package() { function py_package() {
if [[ "$PYTHON_BUILD_SYSTEM" == poetry* ]] if [[ "$PYTHON_BUILD_SYSTEM" =~ ^poetry ]]
then then
maybe_install_poetry maybe_install_poetry
poetry build poetry build
...@@ -754,7 +754,7 @@ variables: ...@@ -754,7 +754,7 @@ variables:
fi fi
# 2: bump-my-version (+ Git commit & tag) # 2: bump-my-version (+ Git commit & tag)
if [[ "$PYTHON_BUILD_SYSTEM" == poetry* ]] if [[ "$PYTHON_BUILD_SYSTEM" =~ ^poetry ]]
then then
maybe_install_poetry maybe_install_poetry
if [[ -z "$py_next_version" ]] if [[ -z "$py_next_version" ]]
...@@ -812,7 +812,7 @@ variables: ...@@ -812,7 +812,7 @@ variables:
} }
function py_publish() { function py_publish() {
if [[ "$PYTHON_BUILD_SYSTEM" == poetry* ]] if [[ "$PYTHON_BUILD_SYSTEM" =~ ^poetry ]]
then then
maybe_install_poetry maybe_install_poetry
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment