Skip to content

CI [scipy-dev] now uses python 3.7 #11409

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

Merged
merged 5 commits into from
Jul 20, 2018
Merged

CI [scipy-dev] now uses python 3.7 #11409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d567a7
CI [scipy-dev] now uses python 3.7
jnothman Jul 3, 2018
52e9eb9
MNT Add 3.7 to PyPI classifiers
jnothman Jul 3, 2018
72e859d
Merge branch 'master' into py37
rth Jul 19, 2018
13b2252
Remove comments following lesteve's suggestion
rth Jul 19, 2018
d978667
Merge branch 'master' into py37
rth Jul 20, 2018
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
18 changes: 9 additions & 9 deletions build_tools/travis/install.sh
View file
Open in desktop
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
Copy link
Member Author

Choose a reason for hiding this comment

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

I now wonder if we should just use python here without pinning the version.

Copy link
Member

Choose a reason for hiding this comment

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

Anticipating Python 4 ? )

I think it doesn't hurt to indicate explicitly for the reader that it tests 3.7 ..

pip install --upgrade pip setuptools

echo "Installing numpy and scipy master wheels"
Expand Down
1 change: 1 addition & 0 deletions setup.py
View file
Open in desktop
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