Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test: Add smoke test for pyenv #315

Merged
merged 3 commits into from
Sep 26, 2024
Merged

test: Add smoke test for pyenv #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f926b6e
test: Add smoke test for pyenv
xmnlab Sep 26, 2024
03a320e
fix issues with ipython inside the smoke test
xmnlab Sep 26, 2024
4a784bc
fix issues when running smoke test for pyenv
xmnlab Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/scicookie/{{cookiecutter.project_slug}}/virtualenvs/pyenv/requirements.txt
View file
Open in desktop
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
View file
Open in desktop
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
53 changes: 6 additions & 47 deletions tests/smoke/base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +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"
export PROJECT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && cd ../.. && pwd )"

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
source $PROJECT_PATH/tests/smoke/base-template.sh ${1}

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

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 @@ -62,10 +20,9 @@ if [[ "${input_params}" == *"use_conda=yes"* ]]; then
fi

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this was the main issue

fi

# remove any path to scicookie environment
Expand Down Expand Up @@ -127,3 +84,5 @@ export PATH=${PATH_ORI}

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

set +ex
6 changes: 4 additions & 2 deletions tests/smoke/virtual-envs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +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
Loading