-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
MRG: Minor fixes to testing framework #4541
Conversation
@agramfort CIs look like they're headed toward happiness |
Codecov Report
@@ Coverage Diff @@
## master #4541 +/- ##
=========================================
Coverage ? 87.02%
=========================================
Files ? 349
Lines ? 65609
Branches ? 10174
=========================================
Hits ? 57099
Misses ? 5630
Partials ? 2880 |
@@ -13,78 +13,78 @@ matrix: | |||
include: | |||
# Full (Linux, 2.7) first half | |||
- os: linux | |||
env: CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi pytest" | |||
PIP_DEPENDENCIES="git+git://github.com/nipy/PySurfer.git nitime faulthandler joblib nibabel codecov nose-timer nose-faulthandler pytest-sugar pytest-cov pytest-attrib" | |||
env: CONDA_DEPENDENCIES="numpy scipy matplotlib pandas scikit-learn h5py pillow statsmodels mayavi nose pytest pytest-cov" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove nose?
No we still do a lot of nose assert imports. It will take a separate PR
with thousands of changed lines to fix that
|
how about having our assert_* functions in fixes.py so we don't need to change every single line for now? |
Only hundreds of lines then :)
Probably better for a follow up PR though
|
yes ok.
|
LGTM |
I would do that as intermediate step if we really need to remove the nose dependency. But as end goal I would change all Either way I would also do them on a different PR. So +1 in merging this one as it is. |
@larsoner you need to rebase |
@agramfort done |
is the Makefile and the make test target already switched to pytest ? if so +1 for MRG |
Yep, @massich did that in a previous PR and I tweaked the values here based on the attribute/mark switch Just pushed a commit to fix a rebase error, will merge once the CIs come back happy Then we can figure out #4523 :) Maybe the first thing to do is just put the existing Travis 2.7 config in |
Going to have to rebase again. @agramfort okay to merge once CIs are happy? |
yes ok to merge when Cis are green |
This PR:
nose
cruftpytest
slow-test markerssklearn
that had incorrect versionsCloses #4518.