Skip to content

Pytest documentation + build tweaks #8026

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 20, 2017
Merged

Pytest documentation + build tweaks #8026

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
bdb8682
TST: Close figures before image comparison.
QuLogic Feb 5, 2017
b71447f
Remove test_mouseclicks and copy some bits to docs.
QuLogic Feb 5, 2017
c632e41
Use pytest.importorskip for consistent skip message.
QuLogic Feb 5, 2017
113d079
Remove nose from tox environment.
QuLogic Feb 5, 2017
9d36e98
Document markers used by pytest.
QuLogic Feb 3, 2017
d9fbe8d
Fix tests.py when passing modules instead of paths.
QuLogic Feb 5, 2017
244806d
Update documentation to use pytest for testing.
QuLogic Feb 6, 2017
25192ea
Change setup to require pytest instead of nose.
QuLogic Feb 6, 2017
50eaad6
Remove multiprocess nose stuff.
QuLogic Feb 14, 2017
4529002
TST: Add 3.6 to tox.ini.
QuLogic Feb 16, 2017
5bc91c7
Move conftest.py so it works with uninstalled tests.
QuLogic Feb 16, 2017
a4427a1
Fix running of tests without installation.
QuLogic Feb 16, 2017
6a0c3ee
Update pytest documentation based on review.
QuLogic Feb 18, 2017
29c1308
TST: Remove extra Travis build.
QuLogic Feb 18, 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
Fix tests.py when passing modules instead of paths.
  • Loading branch information
@QuLogic
QuLogic committed Feb 16, 2017
commit d9fbe8d14bd1f699ab6e8f41ff64ea8f62cb3b2b
17 changes: 15 additions & 2 deletions lib/matplotlib/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1536,8 +1536,21 @@ def test(verbosity=None, coverage=False, switch_backend_warn=True,
import pytest

args = kwargs.pop('argv', [])
if not any(os.path.exists(arg) for arg in args):
args += ['--pyargs'] + default_test_modules
provide_default_modules = True
use_pyargs = True
for arg in args:
if any(arg.startswith(module_path)
for module_path in default_test_modules):
provide_default_modules = False
break
if os.path.exists(arg):
provide_default_modules = False
use_pyargs = False
break
if use_pyargs:
args += ['--pyargs']
if provide_default_modules:
args += default_test_modules

if coverage:
args += ['--cov']
Expand Down