Skip to content

Commit

Permalink
Change sys.path in conf.py
Browse files Browse the repository at this point in the history
  • Loading branch information
EtienneCmb committed Feb 6, 2019
1 parent c9c46c2 commit 72d64fc
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 16 deletions.
3 changes: 1 addition & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ jobs:
conda create -n testenv --yes python=3.6 numpy scipy pip joblib matplotlib;
source activate testenv;
pip install -U pip;
pip install sphinx sphinx-gallery sphinx_rtd_theme pillow;
pip install numpydoc;
pip install -U sphinx sphinx-gallery sphinx_rtd_theme pillow numpydoc;
echo $PATH;
echo $CIRCLE_BRANCH;
which python;
Expand Down
6 changes: 0 additions & 6 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,11 @@

# You can set these variables from the command line.
SPHINXOPTS =
PAPER =
SPHINXBUILD = sphinx-build
SPHINXPROJ = Tensorpac
SOURCEDIR = source
BUILDDIR = build

# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .

# Put it first so that "make" without argument is like "make help".
help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
Expand Down
16 changes: 9 additions & 7 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@
import os
import sys
import sphinx_rtd_theme
import tensorpac
# import sphinx_gallery
# import numpydoc

# sys.path.append(os.path.abspath('../'))
# sys.path.append(os.path.abspath('tensorpac'))
# sys.path.insert(0, os.path.abspath('tensorpac'))
sys.path.insert(0, os.path.abspath('../'))
# If extensions (or modules to document with autodoc) are in another directory,
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
# sys.path.insert(0, os.path.abspath('../'))
sys.path.insert(0, os.path.abspath('sphinxext'))

# -- General configuration ------------------------------------------------

Expand Down Expand Up @@ -69,17 +71,17 @@

# General information about the project.
project = 'Tensorpac'
copyright = '2017, Etienne Combrisson'
copyright = '2019, Etienne Combrisson'
author = 'Etienne Combrisson'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '0.5.5'
version = tensorpac.__version__
# The full version, including alpha/beta/rc tags.
release = '0.5.5'
release = tensorpac.__version__

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion tensorpac/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
from .pac import Pac
from .utils import *

__version__ = "0.5.4"
__version__ = "0.5.6"

0 comments on commit 72d64fc

Please sign in to comment.