diff --git a/bin/steps/pipenv-python-version b/bin/steps/pipenv-python-version index 67389db42538d4e101df2abd884db1d1ebee73d0..604f2dca5502fd1170fb1e6e38f751b9d8780653 100755 --- a/bin/steps/pipenv-python-version +++ b/bin/steps/pipenv-python-version @@ -5,9 +5,12 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then if [[ ! -f $BUILD_DIR/runtime.txt ]]; then if [[ ! -f Pipfile.lock ]]; then puts-warn "Pipfile.lock not found!" - else + echo '{}' > Pipfile.lock + fi + + if [[ -f Pipfile.lock ]]; then set +e - PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r) 2>&1 /dev/null + PYTHON=$(cat $BUILD_DIR/Pipfile.lock | jq '._meta.requires.python_version' -r) set -e if [ "$PYTHON" = 2.7 ]; then @@ -17,6 +20,7 @@ if [[ -f $BUILD_DIR/Pipfile ]]; then echo "python-3.6.0" > $BUILD_DIR/runtime.txt fi fi + fi fi diff --git a/test/run b/test/run index 1e3942d41b33da8a6e783275eb0ba609e4cc4120..7b7259879f212a04ade98d64043fc3948b9cad19 100755 --- a/test/run +++ b/test/run @@ -1,5 +1,11 @@ #!/usr/bin/env bash +testPipenvVersion() { + compile "pipenv-version" + assertCaptured "3.6.0" + assertCapturedSuccess +} + testPipenv() { compile "pipenv" assertCapturedSuccess @@ -21,11 +27,7 @@ testNLTK() { -testPipenvVersion() { - compile "pipenv-version" - assertCaptured "3.6.0" - assertCapturedSuccess -} + testNewlineRuntime() { compile "newline-runtime"