8000 [MRG+1] Run sphinxext doctests only on CircleCI by lesteve · Pull Request #8228 · scikit-learn/scikit-learn · GitHub
[go: up one dir, main page]
Skip to content

[MRG+1] Run sphinxext doctests only on CircleCI #8228

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 1 commit into from
Jan 25, 2017
+18 −14
Merged

[MRG+1] Run sphinxext doctests only on CircleCI #8228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions build_tools/circle/build_doc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,15 @@ then
wget https://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh \
-O miniconda.sh
fi
chmod +x miniconda.sh && ./miniconda.sh -b -p $HOME/miniconda
chmod +x miniconda.sh && ./miniconda.sh -b -p $MINICONDA_PATH
cd ..
export PATH="$HOME/miniconda/bin:$PATH"
export PATH="$MINICONDA_PATH/bin:$PATH"
conda update --yes --quiet conda
popd

# Configure the conda environment and put it in the path using the
# provided versions
conda create -n testenv --yes --quiet python numpy scipy \
conda create -n $CONDA_ENV_NAME --yes --quiet python numpy scipy \
cython nose coverage matplotlib sphinx pillow
source activate testenv

Expand Down
2 changes: 1 addition & 1 deletion build_tools/travis/test_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ run_tests() {

# Test doc
cd $OLDPWD
make test-doc test-sphinxext
make test-doc
}

if [[ "$RUN_FLAKE8" == "true" ]]; then
Expand Down
12 changes: 10 additions & 2 deletions circle.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ checkout:
post:
- ./build_tools/circle/checkout_merge_commit.sh

machine:
environment:
MINICONDA_PATH: $HOME/miniconda
CONDA_ENV_NAME: testenv

dependencies:
cache_directories:
- "~/scikit_learn_data"
Expand All @@ -12,10 +17,13 @@ dependencies:
override:
- ./build_tools/circle/build_doc.sh:
timeout: 3600 # seconds

test:
override:
# override is needed otherwise nosetests is run by default
- echo "Documentation has been built in the 'dependencies' step. No additional test to run"
- |
export PATH="$MINICONDA_PATH/bin:$PATH"
source activate $CONDA_ENV_NAME
make test-sphinxext
deployment:
push:
branch: /^master$|^[0-9]+\.[0-9]+\.X$/
Expand Down
12 changes: 4 additions & 8 deletions doc/sphinxext/sphinx_issues.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
"""A Sphinx extension for linking to your project's issue tracker."""
"""
"""A Sphinx extension for linking to your project's issue tracker.

Copyright 2014 Steven Loria

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand All @@ -22,12 +22,8 @@
THE SOFTWARE.
"""

try:
from docutils import nodes, utils
from sphinx.util.nodes import split_explicit_title
except ImportError:
# Load lazily so that test-sphinxext does not require docutils dependency
pass
from docutils import nodes, utils
from sphinx.util.nodes import split_explicit_title

__version__ = '0.2.0'
__author__ = 'Steven Loria'
Expand Down
0