MacPython · amueller · Feb 22, 2019 · Jan 30, 2019 · Jan 30, 2019 · Jan 31, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,21 @@
 env:
   global:
-      - REPO_DIR="scikit-learn"
-      - BUILD_COMMIT=0.20.2
-      - PLAT=x86_64
-      - UNICODE_WIDTH=32
-      - NP_BUILD_DEP="numpy==1.8.2"
-      - NP_TEST_DEP="numpy==1.13.1"
-      - SCIPY_BUILD_DEP="scipy"
-      - SCIPY_TEST_DEP="scipy"
-      - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
-      # Following generated with
-      # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
-      - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos="
+    - REPO_DIR="scikit-learn"
+    - BUILD_COMMIT=0.20.2
+    - PLAT=x86_64
+    - UNICODE_WIDTH=32
+    - NP_BUILD_DEP="numpy==1.8.2"
+    - NP_TEST_DEP="numpy==1.13.1"
+    - CYTHON_BUILD_DEP="cython==0.28.5"
+    - CYTHON_TEST_DEP="cython"
+    - SCIPY_BUILD_DEP="scipy"
+    - SCIPY_TEST_DEP="scipy"
+    - DAILY_COMMIT=master
+    - DAILY_BUILD=false
+    - WHEELHOUSE_UPLOADER_USERNAME=travis-worker
+    # Following generated with
+    # travis encrypt -r MacPython/scikit-learn-wheels WHEELHOUSE_UPLOADER_SECRET=<the api key>
+    - secure: "Lyhm6qFtf/hY5D3UHMANNhh8Ar/PARF1nH/ebArWLtb24prrSYt+AAVJqZ81I58AdQK12Kn8mmuZVyVJT+FrRd8q6OyMijQ/wKrsx8EH+lDTTgUueBJtLql01KsaMRTDpAd04bREh1MppIsFFCHKVNxY2mW17XwsNQ+MUka4Bos="
 
 language: python
 # Default Python version is usually 2.7
@@ -21,8 +25,8 @@ dist: trusty
 
 matrix:
   exclude:
-      # Exclude the default Python 3.5 build
-      - python: 3.5
+    # Exclude the default Python 3.5 build
+    - python: 3.5
   include:
     - os: linux
       env:
@@ -62,6 +66,7 @@ matrix:
       env:
         - MB_PYTHON_VERSION=3.6
         - NP_BUILD_DEP=numpy==1.11.3
+        - DAILY_BUILD=true
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.6
@@ -72,6 +77,7 @@ matrix:
         - MB_PYTHON_VERSION=3.7
         - NP_BUILD_DEP=numpy==1.14.5
         - NP_TEST_DEP=numpy==1.14.5
+        - DAILY_BUILD=true
     - os: linux
       env:
         - MB_PYTHON_VERSION=3.7
@@ -96,32 +102,45 @@ matrix:
       env:
         - MB_PYTHON_VERSION=3.6
         - NP_BUILD_DEP=numpy==1.11.3
+        - DAILY_BUILD=true
     - os: osx
       language: generic
       env:
         - MB_PYTHON_VERSION=3.7
         - NP_BUILD_DEP=numpy==1.14.5
         - NP_TEST_DEP=numpy==1.14.5
+        - DAILY_BUILD=true
 
 before_install:
-    - BUILD_DEPENDS="$NP_BUILD_DEP cython==0.28.4 $SCIPY_BUILD_DEP"
-    - TEST_DEPENDS="$NP_TEST_DEP pytest $SCIPY_TEST_DEP"
-    - source multibuild/common_utils.sh
-    - source multibuild/travis_steps.sh
-    - before_install
+  - |
+    if [ "$TRAVIS_BRANCH" == "master" ]; then
+        if [ "$DAILY_BUILD" != "true" ]; then
+            exit 0
+        fi
+        CONTAINER="sklearn-nightly"
+        BUILD_COMMIT=${DAILY_COMMIT:-$BUILD_COMMIT}
+    else
+        CONTAINER=wheels
+        UPLOAD_ARGS="--no-update-index"
+    fi
+  - BUILD_DEPENDS="$NP_BUILD_DEP $CYTHON_BUILD_DEP $SCIPY_BUILD_DEP"
+  - TEST_DEPENDS="$NP_TEST_DEP pytest $CYTHON_TEST_DEP $SCIPY_TEST_DEP"
+  - source multibuild/common_utils.sh
+  - source multibuild/travis_steps.sh
+  - before_install
 
 install:
-    # Maybe get and clean and patch source
-    - clean_code $REPO_DIR $BUILD_COMMIT
-    - build_wheel $REPO_DIR $PLAT
+  # Maybe get and clean and patch source
+  - clean_code $REPO_DIR $BUILD_COMMIT
+  - build_wheel $REPO_DIR $PLAT
 
 script:
-    - install_run $PLAT
+  - install_run $PLAT
 
 after_success:
-    # Upload wheels to Rackspace container
-    - pip install wheelhouse-uploader
-    - python -m wheelhouse_uploader upload --local-folder
-          ${TRAVIS_BUILD_DIR}/wheelhouse/
-          --no-update-index
-          wheels
+  # Upload wheels to Rackspace container
+  - pip install wheelhouse-uploader
+  - python -m wheelhouse_uploader upload --local-folder
+        ${TRAVIS_BUILD_DIR}/wheelhouse/
+        $UPLOAD_ARGS
+        $CONTAINER
diff --git a/appveyor.yml b/appveyor.yml
@@ -16,8 +16,11 @@ environment:
     # Make sure we don't download large datasets when running the test on
     # continuous integration platform
     SKLEARN_SKIP_NETWORK_TESTS: 1
+    APPVEYOR_SKIP_FINALIZE_ON_EXIT: true
     # Minimum numpy version
     NP_BUILD_DEP: "1.10.4"
+    DAILY_COMMIT: master
+    DAILY_BUILD: "false"
 
   matrix:
     - PYTHON: "C:\\Python27"
@@ -53,6 +56,7 @@ environment:
       PYTHON_VERSION: "3.6.0"
       PYTHON_ARCH: "64"
       NP_BUILD_DEP: "1.12.1"
+      DAILY_BUILD: "true"
 
     - PYTHON: "C:\\Python37"
       PYTHON_VERSION: "3.7.0"
@@ -63,7 +67,20 @@ environment:
       PYTHON_VERSION: "3.7.0"
       PYTHON_ARCH: "64"
       NP_BUILD_DEP: "1.14.5"
-
+      DAILY_BUILD: "true"
+
+init:
+  - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
+  - "ECHO \"%APPVEYOR_SCHEDULED_BUILD%\""
+  - ps: >-
+      if ($env:APPVEYOR_REPO_BRANCH -eq "master") {
+        $env:CONTAINER = "sklearn-nightly"
+        if ($env:DAILY_COMMIT) { $env:BUILD_COMMIT = $env:DAILY_COMMIT }
+        if ($env:DAILY_BUILD -eq "false") { Exit-AppveyorBuild }
+      } else {
+        $env:CONTAINER = "wheels"
+        $env:UPLOAD_ARGS = "--no-update-index"
+      }
 
 install:
   # Install Python (from the official .msi of http://python.org) and pip when
@@ -118,7 +135,11 @@ on_success:
   # Upload the generated wheel package to Rackspace
   # On Windows, Apache Libcloud cannot find a standard CA cert bundle so we
   # disable the ssl checks.
-  - "python -m wheelhouse_uploader upload --no-update-index --no-ssl-check --local-folder=dist wheels"
+  - python -m wheelhouse_uploader upload
+    --no-ssl-check
+    --local-folder=dist
+    %UPLOAD_ARGS%
+    %CONTAINER%
 
 cache:
   # Use the appveyor cache to avoid re-downloading large archives such

diff --git a/appveyor/requirements.txt b/appveyor/requirements.txt
@@ -1,5 +1,5 @@
 scipy==1.1.0
-cython==0.28.4
+cython==0.28.5
 pytest
 wheel
 wheelhouse_uploader
diff --git a/multibuild b/multibuild
+6 −0		.appveyor.yml
+8 −11		.travis.yml
+1 −1		LICENSE
+2 −10		README.rst
+10 −15		common_utils.sh
+4 −6		library_builders.sh
+2 −2		manylinux_utils.sh
+7 −29		osx_utils.sh
+2 −9		tests/test_fill_pypy_ver.sh
+0 −4		tests/test_fill_pyver.sh
+2 −1		tests/test_library_builders.sh
+1 −7		tests/test_manylinux_utils.sh
+0 −3		tests/test_osx_utils.sh
+0 −3		tests/test_python_install.sh