MNT: Fix CircleCI builds by unpinning + full docs for PRs

kernc · kernc · commit c3abe8b51db7 · 2021-10-07T03:34:45.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -9,18 +9,7 @@ jobs:
       - MKL_NUM_THREADS: 2
       - MINICONDA_PATH: ~/miniconda
       - CONDA_ENV_NAME: testenv
-      - PYTHON_VERSION: 3.6
-      - NUMPY_VERSION: 1.14.6
-      - SKLEARN_VERSION: 0.20.4
-      - SCIPY_VERSION: 1.1.0
-      - MATPLOTLIB_VERSION: 2.1.1
-      # on conda, this is the latest for python 3.5
-      # The following places need to be in sync with regard to Cython version:
-      # - .circleci config file
-      # - sklearn/_build_utils/__init__.py
-      # - advanced installation guide
-      - CYTHON_VERSION: 0.28.5
-      - SCIKIT_IMAGE_VERSION: 0.13
+      - PYTHON_VERSION: 3.7
     steps:
       - checkout
       - run: ./build_tools/circle/checkout_merge_commit.sh
diff --git a/build_tools/circle/build_doc.sh b/build_tools/circle/build_doc.sh
@@ -121,9 +121,6 @@ if [[ "$CIRCLE_BRANCH" =~ ^master$|^[0-9]+\.[0-9]+\.X$ && -z "$CI_PULL_REQUEST"
 then
     # PDF linked into HTML
     make_args="dist LATEXMKOPTS=-halt-on-error"
-elif [[ "$build_type" =~ ^QUICK ]]
-then
-    make_args=html-noplot
 elif [[ "$build_type" =~ ^'BUILD: detected examples' ]]
 then
     # pattern for examples to run is the last line of output
@@ -168,10 +165,10 @@ fi
 
 # packaging won't be needed once setuptools starts shipping packaging>=17.0
 conda create -n $CONDA_ENV_NAME --yes --quiet python="${PYTHON_VERSION:-*}" \
-  numpy="${NUMPY_VERSION:-*}" scipy="${SCIPY_VERSION:-*}" \
-  cython="${CYTHON_VERSION:-*}" pytest coverage \
-  matplotlib="${MATPLOTLIB_VERSION:-*}" sphinx=2.1.2 pillow \
-  scikit-image="${SCIKIT_IMAGE_VERSION:-*}" pandas="${PANDAS_VERSION:-*}" \
+  numpy scipy \
+  cython pytest coverage \
+  matplotlib sphinx pillow \
+  scikit-image pandas \
   joblib memory_profiler packaging
 
 export MPLBACKEND="agg"
