Skip to content

MAINT moved all "d" modules to pytest. #7885

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

Merged
merged 2 commits into from
Jan 22, 2017
Merged

MAINT moved all "d" modules to pytest. #7885

merged 2 commits into from
Jan 22, 2017

Conversation

NelleV
Copy link
Member

@NelleV NelleV commented Jan 20, 2017

This PR migrates the modules starting by "d" from nosetests to pytest.

@QuLogic
Copy link
Member

QuLogic commented Jan 20, 2017

test_dviread is covered by #7872.

@NelleV
Copy link
Member Author

NelleV commented Jan 20, 2017

I removed the corresponding commit.

@QuLogic QuLogic added this to the 2.1 (next point release) milestone Jan 20, 2017
@NelleV NelleV changed the title MAINT moved all "d" modules to pytest. [MRG] MAINT moved all "d" modules to pytest. Jan 20, 2017
@@ -1,12 +1,12 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import six
Copy link
Member

Choose a reason for hiding this comment

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

The line below uses six.

Copy link
Member

Choose a reason for hiding this comment

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

As an import?

Copy link
Member Author

Choose a reason for hiding this comment

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

I don't see where the import is useful.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah, I'm not able to find any use of six. in that file.

Copy link
Member

Choose a reason for hiding this comment

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

Sorry, I wasn't thinking properly.

@codecov-io
Copy link

Current coverage is 62.17% (diff: 100%)

Merging #7885 into master will increase coverage by <.01%

@@             master      #7885   diff @@
==========================================
  Files           174        174          
  Lines         56121      56121          
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits          34894      34896     +2   
+ Misses        21227      21225     -2   
  Partials          0          0          

Powered by Codecov. Last update 9000e58...11b8dcd

@QuLogic QuLogic changed the title [MRG] MAINT moved all "d" modules to pytest. [MRG+1] MAINT moved all "d" modules to pytest. Jan 20, 2017
@phobson
Copy link
Member

phobson commented Jan 21, 2017

Used Github's UI to resolve a merge conflict that came from merging the test_c* PR before this one. I'll let the CI run and then finish the merge.

@phobson phobson merged commit 0f144d3 into matplotlib:master Jan 22, 2017
@phobson phobson changed the title [MRG+1] MAINT moved all "d" modules to pytest. MAINT moved all "d" modules to pytest. Jan 22, 2017
@NelleV NelleV deleted the pytest_d_modules branch January 29, 2017 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants