Skip to content

Commit

Permalink
fix issues when running smoke test for pyenv
Browse files Browse the repository at this point in the history
  • Loading branch information
xmnlab committed Sep 26, 2024
1 parent 03a320e commit 4a784bc
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 57 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
python < 3.11
{%- if cookiecutter.build_system == "poetry" %}
poetry
{%- elif cookiecutter.build_system == "flit" %}
Expand Down
56 changes: 56 additions & 0 deletions tests/smoke/base-template.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#!/usr/bin/env bash
echo "-------------------- Smoke test for ${1} -------------------"
set -ex

export PATH_ORI=${PATH}
export PWD_ORI=$(pwd)
export PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd ../.. && pwd )"

export CONDA_PATH=$(ensureconda --conda --no-install | sed 's:/mamba$:/conda:')
export MAMBA_PATH=$(ensureconda --mamba --no-install | sed 's:/conda$:/mamba:')

if [[ ! -f "$MAMBA_PATH" ]]; then
echo "[EE] 'mamba' not found."
exit 1
fi

if [[ ! -f "$CONDA_PATH" ]]; then
echo "[EE] 'conda' not found."
exit 1
fi

export input_params="$1"

if [[ "${input_params}" == *"use_conda=yes"* ]] || [[ "$input_params" == *"use_pyenv=yes"* ]]; then
echo "Virtual environment defined."
else
export input_params="use_conda=yes ${input_params}"
fi

# NOTE: FOR NOW IT IS JUST USED BY POETRY
export USE_PYENV=0

if [[ "${input_params}" == *"use_makim=yes"* ]] || [[ "$input_params" == *"use_make=yes"* ]]; then
echo "Automation task tool defined."
else
export input_params="use_makim=yes ${input_params}"
fi

if [[ "${input_params}" == *"use_pre_commit=yes"* ]]; then
echo "pre-commit tool defined."
else
export input_params="use_pre_commit=yes ${input_params}"
fi

export OUTPUT_DIR="/tmp/osl"
rm -rf "${OUTPUT_DIR}"
mkdir -p "${OUTPUT_DIR}"

cookiecutter --no-input \
--output-dir "${OUTPUT_DIR}" \
"${PROJECT_PATH}/src/scicookie" \
${input_params}

echo "${OUTPUT_DIR}"

set +ex
60 changes: 6 additions & 54 deletions tests/smoke/base.sh
Original file line number Diff line number Diff line change
@@ -1,61 +1,16 @@
#!/usr/bin/env bash
echo "-------------------- Smoke test for ${1} -------------------"
set -ex

PATH_ORI=${PATH}
PWD_ORI=$(pwd)
PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd ../.. && pwd )"

CONDA_PATH=$(ensureconda --conda --no-install | sed 's:/mamba$:/conda:')
MAMBA_PATH=$(ensureconda --mamba --no-install | sed 's:/conda$:/mamba:')

if [[ ! -f "$MAMBA_PATH" ]]; then
echo "[EE] 'mamba' not found."
exit 1
fi

if [[ ! -f "$CONDA_PATH" ]]; then
echo "[EE] 'conda' not found."
exit 1
fi

input_params="$1"

if [[ "${input_params}" == *"use_conda=yes"* ]] || [[ "$input_params" == *"use_pyenv=yes"* ]]; then
echo "Virtual environment defined."
else
input_params="use_conda=yes ${input_params}"
fi

# NOTE: FOR NOW IT IS JUST USED BY POETRY
USE_PYENV=0
export PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd ../.. && pwd )"

if [[ "${input_params}" == *"use_makim=yes"* ]] || [[ "$input_params" == *"use_make=yes"* ]]; then
echo "Automation task tool defined."
else
input_params="use_makim=yes ${input_params}"
fi
source $PROJECT_PATH/tests/smoke/base-template.sh ${1}

if [[ "${input_params}" == *"use_pre_commit=yes"* ]]; then
echo "pre-commit tool defined."
else
input_params="use_pre_commit=yes ${input_params}"
fi
set -ex

ENV_NAME=osl-python-package

OUTPUT_DIR="/tmp/osl"
rm -rf "${OUTPUT_DIR}"
mkdir -p "${OUTPUT_DIR}"

cookiecutter --no-input \
--output-dir "${OUTPUT_DIR}" \
"${PROJECT_PATH}/src/scicookie" \
${input_params}

cd "${OUTPUT_DIR}/${ENV_NAME}"


if [[ "${input_params}" == *"use_conda=yes"* ]]; then
set +x
eval "$($CONDA_PATH shell.bash hook)"
Expand All @@ -65,11 +20,9 @@ if [[ "${input_params}" == *"use_conda=yes"* ]]; then
fi

if [[ "$input_params" == *"use_pyenv=yes"* ]]; then
USE_PYENV=1
set +x
virtualenv "${ENV_NAME}"
source "${ENV_NAME}/bin/activate"
set -x
pip install -r requirements.txt
fi

# remove any path to scicookie environment
Expand All @@ -78,9 +31,6 @@ export PATH=$(echo $PATH| sed -E "s/[^:]+\/scicookie\/[^:]+//g")
BUILD_SYSTEM="others"

if command -v poetry &> /dev/null; then
if [[ "$USE_PYENV" == "1" ]]; then
poetry config virtualenvs.create true --local
fi
poetry install
elif command -v flit &> /dev/null; then
flit install
Expand Down Expand Up @@ -134,3 +84,5 @@ export PATH=${PATH_ORI}

echo '---------------------------- passed --------------------------'
cd "${PWD_ORI}"

set +ex
5 changes: 3 additions & 2 deletions tests/smoke/virtual-envs.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#!/usr/bin/env bash
set -e
set -ex

SMOKE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"


. ${SMOKE_DIR}/base.sh "use_conda=yes"
. ${SMOKE_DIR}/base.sh "use_pyenv=yes"

set +ex

0 comments on commit 4a784bc

Please sign in to comment.