Skip to content

Switch testing to pytest completely #7974

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.

Sign up for GitHub

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 14 commits into from
Feb 3, 2017
Merged

Switch testing to pytest completely #7974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6a91b9a
Use pip to install in AppVeyor too.
QuLogic Jan 29, 2017
ab99e65
Rename test_only to avoid pytest collection.
QuLogic Jan 31, 2017
bd91b93
Remove pytest collection filter.
QuLogic Jan 31, 2017
25fdef8
Move pytest_configure into installed area.
QuLogic Jan 31, 2017
c8fc318
Enable pytest-xdist on AppVeyor.
QuLogic Jan 31, 2017
02d7cf8
Change stack level of Figure.gca warning.
QuLogic Jan 31, 2017
30e40c6
Skip broken category test with NumPy < 1.8.0.
QuLogic Jan 31, 2017
80281e9
Use pytest in matplotlib.test().
QuLogic Feb 1, 2017
c520c2c
Stop installing nose in CI.
QuLogic Feb 1, 2017
ed7d353
FIX: implement `__ne__` for `SubplotSpec`
tacaswell Feb 1, 2017
ca255dd
Normalize path case before checking for fonts.
QuLogic Feb 1, 2017
3cb2752
Fix one last old xfail call.
QuLogic Feb 1, 2017
857d846
Fix tests.py when passed explicit filenames.
QuLogic Feb 3, 2017
fe20a23
Always upload coverage on Travis.
QuLogic Feb 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Move pytest_configure into installed area. 
This allows it to work when run via matplotlib.test().
  • Loading branch information
@QuLogic
QuLogic committed Feb 2, 2017
commit 25fdef89a4299843b3803666090bb2153989e506
19 changes: 0 additions & 19 deletions conftest.py
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion lib/matplotlib/sphinxext/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from matplotlib.tests.conftest import mpl_test_settings
from matplotlib.tests.conftest import (mpl_test_settings,
pytest_configure, pytest_unconfigure)
10 changes: 10 additions & 0 deletions lib/matplotlib/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@
import matplotlib


def pytest_configure(config):
matplotlib.use('agg')
matplotlib._called_from_pytest = True
matplotlib._init_tests()


def pytest_unconfigure(config):
matplotlib._called_from_pytest = False


@pytest.fixture(autouse=True)
def mpl_test_settings(request):
from matplotlib.testing.decorators import _do_cleanup
Expand Down
3 changes: 2 additions & 1 deletion lib/mpl_toolkits/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from matplotlib.tests.conftest import mpl_test_settings
from matplotlib.tests.conftest import (mpl_test_settings,
pytest_configure, pytest_unconfigure)