Skip to content
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

Merged
merged 3 commits into from
Sep 12, 2017
Merged

Conversation

larsoner
Copy link
Member

@larsoner larsoner commented Sep 8, 2017

This PR:

  1. Gets rid of some nose cruft
  2. Moves to standard pytest slow-test markers
  3. Fixes our decorators for sklearn that had incorrect versions
  4. Makes AppVeyor a little bit nicer

Closes #4518.

@larsoner larsoner added this to the 0.15 milestone Sep 8, 2017
@larsoner
Copy link
Member Author

larsoner commented Sep 8, 2017

@agramfort CIs look like they're headed toward happiness

@codecov-io
Copy link

codecov-io commented Sep 9, 2017

Codecov Report

❗ No coverage uploaded for pull request base (master@cf9ff8b). Click here to learn what that means.
The diff coverage is 100%.

@@            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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove nose?

@agramfort
Copy link
Member

besides my concern of keeping some nose in travis LGTM

thx heaps @larsoner

@massich wanna have a look?

@larsoner
Copy link
Member Author

larsoner commented Sep 9, 2017 via email

@agramfort
Copy link
Member

how about having our assert_* functions in fixes.py so we don't need to change every single line for now?

@larsoner
Copy link
Member Author

larsoner commented Sep 9, 2017 via email

@agramfort
Copy link
Member

agramfort commented Sep 9, 2017 via email

@massich
Copy link
Contributor

massich commented Sep 11, 2017

LGTM

@massich
Copy link
Contributor

massich commented Sep 11, 2017

how about having our assert_* functions in fixes.py so we don't need to change every single line for now?

I would do that as intermediate step if we really need to remove the nose dependency. But as end goal I would change all assert_* to pytest like asserts.

Either way I would also do them on a different PR. So +1 in merging this one as it is.
BTW, @larsoner any idea why macos travis is not happy?

@agramfort
Copy link
Member

@larsoner you need to rebase

@larsoner
Copy link
Member Author

@agramfort done

@agramfort
Copy link
Member

is the Makefile and the make test target already switched to pytest ?

if so +1 for MRG

@larsoner
Copy link
Member Author

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 environment.yml. That way we'll have something that works on CIs, even if it doesn't work well for users. Then we can iterate on just modifying that file (and/or adding a separate 3.5/6 one) without needing to mess very much with Travis or AppVeyor.

@larsoner
Copy link
Member Author

Going to have to rebase again. @agramfort okay to merge once CIs are happy?

@agramfort
Copy link
Member

yes ok to merge when Cis are green

@larsoner larsoner merged commit 8761925 into mne-tools:master Sep 12, 2017
@larsoner larsoner deleted the pytest branch September 12, 2017 15:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants