Skip to content

Commit a13acb2

Browse files
committed
Use bare pyenv python versions (not virtualenvs)
1 parent f6d5168 commit a13acb2

File tree

2 files changed

+23
-25
lines changed

2 files changed

+23
-25
lines changed

circle/setup.sh

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,20 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
2626

2727
echo "Using pyenv version $(pyenv version)"
2828

29-
ls ${HOME}/.pyenv/versions
30-
31-
exit 1
32-
33-
# only create a pyvenv if it doesn't already exist
34-
if [ ! -d ${PLOTLY_VENV_DIR}/${version} ]; then
35-
virtualenv ${PLOTLY_VENV_DIR}/${version} ||
36-
error_exit "${LINENO}: can't install virtualenv for ${version}"
37-
fi
38-
39-
# get rid of the current virtualenv if we're in one
40-
if [ ${VIRTUAL_ENV} ]; then
41-
deactivate
42-
fi
43-
44-
# drop us into a virtualenv
45-
source ${PLOTLY_VENV_DIR}/${version}/bin/activate ||
46-
error_exit "${LINENO}: can't activate virtualenv for Python ${version}"
29+
# # only create a pyvenv if it doesn't already exist
30+
# if [ ! -d ${PLOTLY_VENV_DIR}/${version} ]; then
31+
# virtualenv ${PLOTLY_VENV_DIR}/${version} ||
32+
# error_exit "${LINENO}: can't install virtualenv for ${version}"
33+
# fi
34+
#
35+
# # get rid of the current virtualenv if we're in one
36+
# if [ ${VIRTUAL_ENV} ]; then
37+
# deactivate
38+
# fi
39+
40+
# # drop us into a virtualenv
41+
# source ${PLOTLY_VENV_DIR}/${version}/bin/activate ||
42+
# error_exit "${LINENO}: can't activate virtualenv for Python ${version}"
4743

4844
# install core requirements all versions need
4945
pip install -r ${PLOTLY_CORE_REQUIREMENTS_FILE} ||

circle/test.sh

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,16 @@ for version in ${PLOTLY_PYTHON_VERSIONS[@]}; do
1919
# exporting this variable (in this scope) chooses the python version
2020
export PYENV_VERSION=${version}
2121

22-
echo "get rid of the current virtualenv if we're in one"
23-
if [ ${VIRTUAL_ENV} ]; then
24-
deactivate
25-
fi
22+
echo "Using pyenv version $(pyenv version)"
2623

27-
echo "drop us into a virtualenv"
28-
source ${PLOTLY_VENV_DIR}/${version}/bin/activate ||
29-
error_exit "${LINENO}: can't activate virtualenv for Python ${version}"
24+
# echo "get rid of the current virtualenv if we're in one"
25+
# if [ ${VIRTUAL_ENV} ]; then
26+
# deactivate
27+
# fi
28+
#
29+
# echo "drop us into a virtualenv"
30+
# source ${PLOTLY_VENV_DIR}/${version}/bin/activate ||
31+
# error_exit "${LINENO}: can't activate virtualenv for Python ${version}"
3032

3133
echo "install plotly (ignoring possibly cached versions)"
3234
pip install -I ${PLOTLY_PACKAGE_ROOT} ||

0 commit comments

Comments
 (0)