From 77d6de0ae5f6d3a6706696e26a4179c27af02cee Mon Sep 17 00:00:00 2001 From: bcolsen Date: Tue, 8 Aug 2017 23:30:02 -0600 Subject: [PATCH] fix test skip and py3.6 --- test/test_evaluate/test_docstring.py | 6 +++++- tox.ini | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/test_evaluate/test_docstring.py b/test/test_evaluate/test_docstring.py index 5cf2861c..7848c21a 100644 --- a/test/test_evaluate/test_docstring.py +++ b/test/test_evaluate/test_docstring.py @@ -183,6 +183,8 @@ def test_numpydoc_parameters_alternative_types(): assert 'numerator' in names assert 'append' in names +@pytest.mark.skipif(numpydoc_unavailable, + reason='numpydoc module is unavailable') def test_numpydoc_returns(): s = dedent(''' def foobar(): @@ -242,7 +244,9 @@ def test_numpydoc_returns_alternative_types(): assert 'capitalize' not in names assert 'numerator' in names assert 'append' in names - + +@pytest.mark.skipif(numpydoc_unavailable, + reason='numpydoc module is unavailable') def test_numpydoc_returns_list_of(): s = dedent(''' def foobar(): diff --git a/tox.ini b/tox.ini index c1893e25..25418473 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py26, py27, py33, py34, py35 +envlist = py26, py27, py33, py34, py35, py36 [testenv] deps = pytest>=2.3.5 @@ -35,6 +35,10 @@ deps = numpydoc {[testenv]deps} [testenv:py35] +deps = + numpydoc + {[testenv]deps} +[testenv:py36] deps = numpydoc {[testenv]deps}