diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..79e8a584 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,11 @@ +# After changing this file, check it on: +# http://lint.travis-ci.org/ +language: python +python: + - 3.3 + - 2.7 +before_install: + - pip install --upgrade pip setuptools # Upgrade pip and setuptools to get ones with `wheel` support + - pip install --find-links http://wheels.astropy.org/ --find-links http://wheels2.astropy.org/ --use-wheel --use-mirrors nose numpy matplotlib Sphinx +script: + - python setup.py test diff --git a/numpydoc/docscrape_sphinx.py b/numpydoc/docscrape_sphinx.py index ba93b2ea..cdc2a37d 100644 --- a/numpydoc/docscrape_sphinx.py +++ b/numpydoc/docscrape_sphinx.py @@ -13,8 +13,8 @@ class SphinxDocString(NumpyDocString): def __init__(self, docstring, config={}): - # Subclasses seemingly do not call this. NumpyDocString.__init__(self, docstring, config=config) + self.load_config(config) def load_config(self, config): self.use_plots = config.get('use_plots', False) diff --git a/numpydoc/tests/test_phantom_import.py b/numpydoc/tests/test_phantom_import.py index 173b5662..80fae08f 100644 --- a/numpydoc/tests/test_phantom_import.py +++ b/numpydoc/tests/test_phantom_import.py @@ -1,5 +1,12 @@ from __future__ import division, absolute_import, print_function -import numpydoc.phantom_import +import sys +from nose import SkipTest + +def test_import(): + if sys.version_info[0] >= 3: + raise SkipTest("phantom_import not ported to Py3") + + import numpydoc.phantom_import # No tests at the moment... diff --git a/numpydoc/tests/test_plot_directive.py b/numpydoc/tests/test_plot_directive.py index 0e511fcb..1ea10769 100644 --- a/numpydoc/tests/test_plot_directive.py +++ b/numpydoc/tests/test_plot_directive.py @@ -1,5 +1,11 @@ from __future__ import division, absolute_import, print_function -import numpydoc.plot_directive +import sys +from nose import SkipTest + +def test_import(): + if sys.version_info[0] >= 3: + raise SkipTest("plot_directive not ported to Python 3 (use the one from Matplotlib instead)") + import numpydoc.plot_directive # No tests at the moment... diff --git a/numpydoc/tests/test_traitsdoc.py b/numpydoc/tests/test_traitsdoc.py index d36e5ddb..fe5078c4 100644 --- a/numpydoc/tests/test_traitsdoc.py +++ b/numpydoc/tests/test_traitsdoc.py @@ -1,5 +1,11 @@ from __future__ import division, absolute_import, print_function -import numpydoc.traitsdoc +import sys +from nose import SkipTest + +def test_import(): + if sys.version_info[0] >= 3: + raise SkipTest("traitsdoc not ported to Python3") + import numpydoc.traitsdoc # No tests at the moment...