diff --git a/.gitmodules b/.gitmodules index e00dfbb9..6a1ac2cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "scikit-learn"] path = scikit-learn - url = git://github.com/scikit-learn/scikit-learn.git + url = git://github.com/thomasjpfan/scikit-learn.git [submodule "multibuild"] path = multibuild url = https://github.com/matthew-brett/multibuild.git diff --git a/.travis.yml b/.travis.yml index 49292fcb..65ab0504 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ env: global: - REPO_DIR="scikit-learn" - - BUILD_COMMIT=0.21.2 + - BUILD_COMMIT="fix_ridge_dtype_match" - PLAT=x86_64 - UNICODE_WIDTH=32 - NP_BUILD_DEP="numpy==1.11.0" @@ -30,37 +30,37 @@ matrix: # Exclude the default Python 3.5 build - python: 3.5 include: - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.5 - - PLAT=i686 - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - DAILY_BUILD=true - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.6 - - PLAT=i686 - - DAILY_BUILD=true - - SCIPY_BUILD_DEP="scipy==0.18.1" - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true - - os: linux - env: - - MB_PYTHON_VERSION=3.7 - - PLAT=i686 - - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.5 + # - SCIPY_BUILD_DEP="scipy==0.18.1" + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.5 + # - PLAT=i686 + # - SCIPY_BUILD_DEP="scipy==0.18.1" + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.6 + # - DAILY_BUILD=true + # - SCIPY_BUILD_DEP="scipy==0.18.1" + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.6 + # - PLAT=i686 + # - DAILY_BUILD=true + # - SCIPY_BUILD_DEP="scipy==0.18.1" + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.7 + # - NP_BUILD_DEP=numpy==1.14.5 + # - DAILY_BUILD=true + # - os: linux + # env: + # - MB_PYTHON_VERSION=3.7 + # - PLAT=i686 + # - NP_BUILD_DEP=numpy==1.14.5 + # - DAILY_BUILD=true - os: osx language: generic env: @@ -71,14 +71,12 @@ matrix: env: - MB_PYTHON_VERSION=3.6 - NP_BUILD_DEP=numpy==1.11.3 - - DAILY_BUILD=true - SCIPY_BUILD_DEP="scipy==0.18.1" - os: osx language: generic env: - MB_PYTHON_VERSION=3.7 - NP_BUILD_DEP=numpy==1.14.5 - - DAILY_BUILD=true before_install: - |