Commit Graph

46 Commits

Author SHA1 Message Date
Joel Nothman 1cc346cece BUILD Give clear error message when there are merge conflicts (#8945) 2017-05-29 13:42:47 +02:00
Naoya Kanai 83d65b84fe Update numpy refs to 1.8.2 (#8926) 2017-05-24 11:53:37 +10:00
Joel Nothman db25f57781 [MRG+1] Update version dependencies to numpy 1.8.2, scipy 1.13.3 (#8855) 2017-05-24 08:24:04 +10:00
Loïc Estève 31326534f5 Remove miniconda installer caching (#8859)
Download takes less than a second both on Travis and Circle.

Also use latest miniconda installer on Circle.
2017-05-11 14:34:08 +02:00
Naoya Kanai b9e7614341 [MRG] Always download latest Miniconda on Travis (#8857) 2017-05-11 13:03:00 +02:00
chkoar 3003da7075 DOC: Correct scikit-learn name in comments (#8681) 2017-04-03 12:20:04 +02:00
Matthew Brett 426f441e9a [MRG+2] use manylinux dev wheels for numpy / scipy (#8536)
* MAINT: use manylinux dev wheels for numpy / scipy

Use daily manylinux wheels for numpy and scipy, instead of
soon-to-be-discontinued per-commit Precise wheels.

* BF: add back ATLAS install for ubuntu build entry

scikit-learn can link against BLAS libraries still at the same location
as they were duing numpy build.
2017-03-07 12:21:11 +01:00
Loïc Estève fcb1403132 Travis: tweak test_script.sh (#8444)
* --with-coverage was repeated twice and nose-timer options were disabled
* make test-doc uses nosetests so skip if if USE_PYTEST is true
2017-02-23 14:55:28 +01:00
Loïc Estève 0ec6664ff1 [MRG] Make tests runnable with pytest without error (#8246)
* Make tests runnable with pytest without error.

Errors were due to pytest quirks with (deprecated) yield support.

* Add pytest build on Travis

and tweak pytest settings in setup.cfg

* Tweak comment
2017-02-20 13:08:09 +01:00
Loïc Estève 80c1bf1895 TRAVIS revert flake8 version to 2.5.1 2017-02-16 07:08:24 +01:00
Rishikesh 77213592b7 [MRG+1] Enable codecov for coverage report (#8311)
* Replace coveralls from codecov for coverage report

Replacing code coverage tool from coveralls to codecov.

Issue: #8305

* Add codecov badge for coverage report

Replace coveralls badge from codecov badge
2017-02-08 07:37:57 +01:00
Loïc Estève fdfdbf025f Test sphinx extensions doctests only on Circle. (#8228)
Some sphinx extensions import sphinx in their doctests.
2017-01-25 22:40:47 +01:00
Joel Nothman 9616acf1bd CI remove obsolete comment 2017-01-22 21:43:35 +11:00
jakirkham 5d6460de28 MNT/BLD Use GitHub's merge refs to test PRs on CircleCI (#8211)
Unlike other CIs, CircleCI does not test the merge commit of a PR with
its base branch. Instead it tests the PR's head commit. The problem with
this is the PR's status could differ when it is merged with the base
branch. For instance, if one needs changes in the base branch to get
their PR to pass, they must rebase/merge to get them into the history
the PR. This normally isn't a problem, but sometimes things do go wrong
when doing this merge/rebase, which adds a new unneeded difficulty.
Alternatively, a passing PR could turn out to fail when merged into the
base branch because some new content in the base branch was not tested
against in the PR.

To solve these issues, we checkout the merge ref for a PR (if it is a
PR) from GitHub. However, it should be noted that the merge ref can be
out-of-date in some cases w.r.t. the base branch. Still this is the
commonly used strategy on Travis CI and AppVeyor. If we had enough info,
we could ideally terminate a build that has merge conflicts.
Unfortunately it doesn't seem that CircleCI gives us this info.
2017-01-18 02:45:37 +01:00
Óscar Nájera bddda7bc69 [MRG + 2] [MAINT] Update to Sphinx-Gallery 0.1.7 (#7986)
and use latest version of sphinx in CircleCI
2017-01-17 23:43:40 +01:00
Loïc Estève 0eb33adb78 TRAVIS fix flake8_diff.sh check_files (#8208)
when $files is empty.

A sphinx-gallery updated introduced flake8 violations which were not
ignored because $files was empty so all the files were checked instead
of only the examples.
2017-01-16 14:02:58 +01:00
Olivier Grisel 096a9cbead [MRG] MAINT Python 3.6 fixes (#8123)
* FIX dict order dependent doctest

* FIX str concat TypeError message changed in Python 3.6

* MAINT upgrade travis config with most recent conda deps
2016-12-27 19:50:25 +01:00
Joel Nothman 83c92a1ba9 CI limit diff to commit range in flake8_diff.sh (#8097) 2016-12-21 13:12:19 +01:00
Joel Nothman 9345bd154b CI fix bug in getting changed docs when no sklearn/ files modified 2016-12-20 21:12:07 +11:00
Joel Nothman aceb73cc52 [MRG + 1] CI some improvements to the flake8 CI (#8036)
Examples now cannot fail due to 'E402 module level import not at top of file'
2016-12-13 18:08:30 +01:00
Joel Nothman 40a1b7a0b1 CI report which doc files were likely affected (#8032) 2016-12-11 00:27:56 +11:00
Joel Nothman 9730d539b6 CI full doc build only for examples; flag to force quick build (#7950) 2016-12-10 21:48:22 +11:00
Loïc Estève 290fe6210d MAINT use sphinx 1.4 to build the doc
Temporary work-around until sphinx-gallery supports sphinx 1.5
2016-12-09 16:49:47 +01:00
Andreas Mueller b7a1ad2673 Revert "CI report which doc files were likely affected (#7938)" 2016-12-09 15:31:58 +11:00
Joel Nothman d45405183a CI report which doc files were likely affected (#7938) 2016-12-07 18:05:18 -05:00
Loïc Estève fc3bec7b8a MAINT remove superflous repo unshallowing in flake8_diff.sh 2016-12-05 15:52:22 +01:00
Joel Nothman a997ac6776 [MRG] CI make html-noplot when doc/ and examples/ not modified (#7923) 2016-11-29 11:43:51 +11:00
Loïc Estève e5bf61eee1 [MRG+1] Dropping python 2.6 support (#7890)
* Remove Python 2.6 support

Some details about some slightly orthogonal changes:
* Note about cheking safely for nan is likely not valid any more (commit
  introducing it is c80ca91b)
* scipy.linalg.qr econ parameter removed since scipy 0.9 in favour of
  mode='economic'
* Remove unnecessary libgfortran in conda create command

* Putative fix by setting the random seed

* Revert unintended change

* Reinstate previous logic for checking for NaNs

* Reinstate change in error message

Error messages from Python 2.7 assertRegexp does not contain the
function name, in contrast with Python 3 assertRegex
2016-11-23 17:11:04 -05:00
Joel Nothman 0c7ee834ac CI gratuitous optimisation of doc pushing (#7887) 2016-11-16 18:21:50 -05:00
Loïc Estève cd4806abb3 Disable git pager in flake8_diff.sh 2016-11-07 14:14:29 +01:00
Loïc Estève 6a2d8d5bbc [MRG+2] BUILD Rewrite setup.py files to handle cython dependencies (#7719)
* Rewriting of cythonization in setup.py

By using Cython.Build.cythonize and switching between .c and .pyx files
as appropriate cython dependencies are correctly taken into account.

* Use cythonize once on the root config rather than in each subpackage

* Fix for Windows

* Remove caching from Travis

Cython dependencies are taken care of by Cython.Build.cythonize and
based on file timestamps, so .C and .so files will always be rebuild
from scratch on each build in Travis.

* Specify .pyx in setup.files for cython generated extensions

More natural this way. Tweak the extensions to generate from .c and .cpp
files for a release.

* COSMIT Remove commented out code

* Check cython version is greater than 0.23

* COSMIT better names for functions

* flake8 fix (imported module not at top of file)

* Install cython 0.23 for Python 2.6

now that cython >= 0.23 requirement is enforced in setup.py

* Use module constant for minimum required cython version

* Fix Travis install.sh

No easy way to put comments inside multi-line command
2016-11-02 22:57:04 +11:00
waterponey e84199669d [MRG] CI build pdf docs when master or version branch (#7747) 2016-10-29 23:24:01 +11:00
Loïc Estève 20912ed389 FIX flake8_diff.sh git repo unshallowing (#7575)
which fixes the issue seen in
https://github.com/scikit-learn/scikit-learn/pull/7027.

Enhancements:
* the script works on PRs targetting a fork rather than the reference
  repo
* improved logic about when to unshallow the repo
* fetching the upstream master branch into a reference rather than a
  branch (less intrusive for scripts than may run afterwards e.g. the
  ones in the after_success step)
* Better logging messages
2016-10-04 19:29:22 +02:00
Joel Nothman 69ca580cd8 [MRG] CI build web site from branches (#7498)
* CI build web site from branches

Fixes #7495

* CI Try one regexp instead of list
2016-09-29 09:21:12 -04:00
Siddharth Gupta c887653e0a [MRG+1] #7466 add pandas to CI jobs (#7499)
* add pandas to CI jobs

* add pandas to CI jobs, removed errors

* commit

* commit

*  add pandas to CI jobs after review1

*  add pandas to CI jobs after review2

*  add pandas to CI jobs after review2-b

*  add pandas to CI jobs, removed extra spaces

*  add pandas to CI jobs, update test_script

*  add pandas to CI jobs, remove formatting error

*  add pandas to CI jobs, remove extranous space
2016-09-28 12:46:46 -04:00
Loïc Estève 98678baafd Avoid creating an ambiguous reference for usptream/master
There was a clash between refs/upstream/master and
refs/remotes/upstream/master. That was problematic when running
flake8_diff.sh locally.
2016-09-23 16:57:09 +02:00
Óscar Nájera 1054e072da [MAINT] Upgrade to Sphinx-Gallery 0.1.4 (#7354)
* [MAINT] Upgrade to Sphinx-Gallery 0.1.4

* Don't run flake8 on Sphinx-Gallery

* Sphinx-Gallery loads the stylesheet not the layout

* Delete old css file of the gallery

* Incorporate scikit-learn css to wrap download buttons

* flake8 message that sphinx-gallery is not checked
2016-09-16 10:58:31 +02:00
Loïc Estève 396dc39c68 Change flake8_diff.sh logic for branch in main repo (#7437)
Only commits that were pushed in the branch are tested. They are
provided by the TRAVIS_COMMIT_RANGE environment variable.
2016-09-15 14:10:33 +02:00
Loïc Estève 53058619b5 Fix flake8_diff.sh when Travis runs in a fork
The grep was not matching anything so the script exited with a 1 exit code.
2016-09-06 16:11:31 +02:00
Loïc Estève 03e3012414 Exclude sklearn/externals from diff for flake8 2016-08-30 12:59:08 +02:00
Loïc Estève 4566251618 [MRG+3] Add flake8 linting of the diff in Travis (#7127)
* Add flake8 linting on the diff

with respect to common ancestor of branch and scikit-learn/scikit-learn
remote.

Add a flake8-diff target in the Makefile and mention it in the doc.

* Only install flake8 when needed
2016-08-30 12:59:57 +10:00
Loïc Estève 3b4ae2845a Fix CircleCI failure (#6903)
The way the environment was activated was a la virtualenv. Maybe it used
to work for some time but not anymore.

[doc build]
2016-06-17 15:40:21 +02:00
Raghav R V 7fea3effa7 CI Install psutil (#6897) 2016-06-16 15:03:59 +02:00
Loïc Estève 2d198950dc MAINT temporary disable MKL in Travis
to have master green on Travis until we fix #6279.

Install nomkl when INSTALL_MKL is not true.
DISTRIB=scipy-dev-wheels uses allow_failures.
2016-03-09 00:43:37 +01:00
Scott Lowe 8d4247174d MAINT: Fix typo in comment for travis/install.sh 2016-02-28 23:45:44 +00:00
Nelson Liu 4b7a0e01ce enh: reorganize build files
fix: change path for building doc on circleci

enh: removed useless WindowError and cythonize.dat in _build_utils init
2016-02-18 09:40:51 -08:00