8000 Remove test-sphinxext from the Makefile. · scikit-learn/scikit-learn@655a942 · GitHub
[go: up one dir, main page]

Skip to content

Commit 655a942

Browse files
committed
Remove test-sphinxext from the Makefile.
Building the documentation on CircleCI is a better test.
1 parent 9616acf commit 655a942

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ inplace:
3030

3131
test-code: in
3232
$(NOSETESTS) -s -v sklearn
33-
test-sphinxext:
34-
$(NOSETESTS) -s -v doc/sphinxext/
3533
test-doc:
3634
ifeq ($(BITS),64)
3735
$(NOSETESTS) -s -v doc/*.rst doc/modules/ doc/datasets/ \
@@ -43,7 +41,7 @@ test-coverage:
4341
rm -rf coverage .coverage
4442
$(NOSETESTS) -s -v --with-coverage sklearn
4543

46-
test: test-code test-sphinxext test-doc
44+
test: test-code test-doc
4745

4846
trailing-spaces:
4947
find sklearn -name "*.py" -exec perl -pi -e 's/[ \t]*$$//' {} \;

build_tools/travis/test_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ run_tests() {
4141

4242
# Test doc
4343
cd $OLDPWD
44-
make test-doc test-sphinxext
44+
make test-doc
4545
}
4646

4747
if [[ "$RUN_FLAKE8" == "true" ]]; then

doc/sphinxext/sphinx_issues.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@
2222
THE SOFTWARE.
2323
"""
2424

25-
try:
26-
from docutils import nodes, utils
27-
from sphinx.util.nodes import split_explicit_title
28-
except ImportError:
29-
# Load lazily so that test-sphinxext does not require docutils dependency
30-
pass
25+
from docutils import nodes, utils
26+
from sphinx.util.nodes import split_explicit_title
3127

3228
__version__ = '0.2.0'
3329
__author__ = 'Steven Loria'

0 commit comments

Comments
 (0)
0