Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 0dfd271

Browse files
anntzeranntzer
authored
Merge pull request #7947 from NelleV/making_stuff_private
[MRG+1] MAINT testing.nose -> testing._nose to make it explicitely private
2 parents eaf05e9 + f41c08b commit 0dfd271

11 files changed

Lines changed: 37 additions & 7 deletions

File tree

‎doc/api/api_changes/deprecations.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
Deprecations
2+
````````````
3+
4+
- `matplotlib.testing.noseclasses` is deprecated and will be removed in 2.3

‎lib/matplotlib/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,15 +1511,15 @@ def _init_tests():
15111511
)
15121512
)
15131513

1514-
from .testing.nose import check_deps
1514+
from .testing._nose import check_deps
15151515
check_deps()
15161516

15171517

15181518
def test(verbosity=1, coverage=False, **kwargs):
15191519
"""run the matplotlib test suite"""
15201520
_init_tests()
15211521

1522-
from .testing.nose import test as nose_test
1522+
from .testing._nose import test as nose_test
15231523
return nose_test(verbosity, coverage, **kwargs)
15241524

15251525

lib/matplotlib/testing/nose/__init__.py renamed to lib/matplotlib/testing/_nose/__init__.py

File renamed without changes.

lib/matplotlib/testing/nose/decorators.py renamed to lib/matplotlib/testing/_nose/decorators.py

File renamed without changes.

lib/matplotlib/testing/nose/exceptions.py renamed to lib/matplotlib/testing/_nose/exceptions.py

File renamed without changes.

lib/matplotlib/testing/nose/plugins/__init__.py renamed to lib/matplotlib/testing/_nose/plugins/__init__.py

File renamed without changes.

lib/matplotlib/testing/nose/plugins/knownfailure.py renamed to lib/matplotlib/testing/_nose/plugins/knownfailure.py

File renamed without changes.

lib/matplotlib/testing/nose/plugins/performgc.py renamed to lib/matplotlib/testing/_nose/plugins/performgc.py

File renamed without changes.

‎lib/matplotlib/testing/decorators.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def skipif(condition, *args, **kwargs):
4040
import pytest
4141
return pytest.mark.skipif(condition, *args, **kwargs)
4242
else:
43-
from .nose.decorators import skipif
43+
from ._nose.decorators import skipif
4444
return skipif(condition, *args, **kwargs)
4545

4646

@@ -65,7 +65,7 @@ def knownfailureif(fail_condition, msg=None, known_exception_class=None):
6565
return pytest.mark.xfail(condition=fail_condition, reason=msg,
6666
raises=known_exception_class, strict=strict)
6767
else:
68-
from .nose.decorators import knownfailureif
68+
from ._nose.decorators import knownfailureif
6969
return knownfailureif(fail_condition, msg, known_exception_class)
7070

7171

@@ -340,7 +340,7 @@ def wrapper(extension):
340340

341341

342342
# sadly we cannot use fixture here because of visibility problems
343-
# and for for obvious reason avoid `nose.tools.with_setup`
343+
# and for for obvious reason avoid `_nose.tools.with_setup`
344344
wrapper.setup, wrapper.teardown = self.setup, self.teardown
345345

346346
return wrapper

‎lib/matplotlib/testing/noseclasses.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
"""
2+
The module testing.noseclasses is deprecated as of 2.1
3+
"""
4+
5+
from __future__ import (absolute_import, division, print_function,
6+
unicode_literals)
7+
try:
8+
from ._nose.plugins.knownfailure import KnownFailure as _KnownFailure
9+
has_nose = True
10+
except ImportError:
11+
has_nose = False
12+
_KnownFailure = object
13+
14+
from .. import cbook
15+
16+
cbook.warn_deprecated(
17+
since="2.1",
18+
message="The noseclass module has been deprecated in 2.1 and will "
19+
"be removed in matplotlib 2.3.")
20+
21+
22+
@cbook.deprecated("2.1")
23+
class KnownFailure(_KnownFailure):
24+
def __init__(self):
25+
if not has_nose:
26+
raise ImportError("Need nose for this plugin.")

0 commit comments

Comments
 (0)