Skip to content

Commit

Permalink
MAINT CI [scipy-dev] now uses python 3.7 (scikit-learn#11409)
Browse files Browse the repository at this point in the history
  • Loading branch information
jnothman authored and rth committed Jul 20, 2018
1 parent 6e94a63 commit 1984dac
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
18 changes: 9 additions & 9 deletions build_tools/travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ export CXX=/usr/lib/ccache/g++
# ~60M is used by .ccache when compiling from scratch at the time of writing
ccache --max-size 100M --show-stats

if [[ "$DISTRIB" == "conda" ]]; then
make_conda() {
TO_INSTALL="$@"
# Deactivate the travis-provided virtual environment and setup a
# conda-based environment instead
deactivate
Expand All @@ -37,6 +38,11 @@ if [[ "$DISTRIB" == "conda" ]]; then
export PATH=$MINICONDA_PATH/bin:$PATH
conda update --yes conda

conda create -n testenv --yes $TO_INSTALL
source activate testenv
}

if [[ "$DISTRIB" == "conda" ]]; then
TO_INSTALL="python=$PYTHON_VERSION pip pytest pytest-cov \
numpy=$NUMPY_VERSION scipy=$SCIPY_VERSION \
cython=$CYTHON_VERSION"
Expand All @@ -62,9 +68,7 @@ if [[ "$DISTRIB" == "conda" ]]; then
if [[ -n "$JOBLIB_VERSION" ]]; then
TO_INSTALL="$TO_INSTALL joblib=$JOBLIB_VERSION"
fi

conda create -n testenv --yes $TO_INSTALL
source activate testenv
make_conda $TO_INSTALL

# for python 3.4, conda does not have recent pytest packages
if [[ "$PYTHON_VERSION" == "3.4" ]]; then
Expand All @@ -83,11 +87,7 @@ elif [[ "$DISTRIB" == "ubuntu" ]]; then
pip install pytest pytest-cov cython==$CYTHON_VERSION

elif [[ "$DISTRIB" == "scipy-dev" ]]; then
# Set up our own virtualenv environment to avoid travis' numpy.
# This venv points to the python interpreter of the travis build
# matrix.
virtualenv --python=python ~/testvenv
source ~/testvenv/bin/activate
make_conda python=3.7
pip install --upgrade pip setuptools

echo "Installing numpy and scipy master wheels"
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ def setup_package():
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
('Programming Language :: Python :: '
'Implementation :: CPython'),
('Programming Language :: Python :: '
Expand Down

0 comments on commit 1984dac

Please sign in to comment.