Skip to content

Commit 84488b5

Browse files
committed
Revert "Use minimal versions for numpy and scipy on CircleCI Python 2 build (#10557)"
This reverts commit e7ecdb0. The examples are failing with Scipy 0.13.3 and we need to investigate.
1 parent c5ef50a commit 84488b5

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

.circleci/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@ jobs:
3838
# PYTHON_VERSION environment variable.
3939
- image: circleci/python:3.6.1
4040
environment:
41-
# Test examples run with minimal dependencies.
4241
- MINICONDA_PATH: ~/miniconda
4342
- CONDA_ENV_NAME: testenv
4443
- PYTHON_VERSION: 2
45-
- NUMPY_VERSION: 1.8.2
46-
- SCIPY_VERSION: 0.13.3
4744
- MATPLOTLIB_VERSION: "1.3"
4845
steps:
4946
- checkout

build_tools/circle/build_doc.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,8 @@ conda update --yes --quiet conda
115115

116116
# Configure the conda environment and put it in the path using the
117117
# provided versions
118-
conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" \
119-
numpy="${NUMPY_VERSION:-*}" scipy="${SCIPY_VERSION:-*}" cython \
120-
pytest coverage matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=1.6.2 pillow
118+
conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" numpy scipy \
119+
cython pytest coverage matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=1.6.2 pillow
121120

122121
source activate testenv
123122
pip install sphinx-gallery

0 commit comments

Comments
 (0)