Skip to content

Commit

Permalink
Merge pull request #2 from ghammad/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ghammad authored Jan 11, 2019
2 parents 97069d0 + 6c12a13 commit 5b39008
Show file tree
Hide file tree
Showing 18 changed files with 25,628 additions and 82,032 deletions.
5 changes: 3 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ test:
pages:
stage: deploy
script:
- pip install sphinx sphinx-bootstrap-theme
- pip install sphinx sphinx-bootstrap-theme nbsphinx
- mkdir -p ../pyActigraphy-docs/html
- cd docs ; make html
- mv build/html/ ../public/
- mv ../../pyActigraphy-docs/html/ ../public/
artifacts:
paths:
- public
Expand Down
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
:target: https://www.gnu.org/licenses/gpl-3.0
.. image:: https://gitlab.com/ghammad/pyActigraphy/badges/master/pipeline.svg
:target: https://gitlab.com/ghammad/pyActigraphy/commits/master
.. image:: https://gitlab.com/ghammad/pyActigraphy/badges/master/coverage.svg
:target: https://gitlab.com/ghammad/pyActigraphy/commits/master

**pyActigraphy**
================
Expand Down
9 changes: 5 additions & 4 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def run(self):

def setup(app):
app.add_directive('autoautosummary', AutoAutoSummary)

app.add_javascript('https://cdnjs.cloudflare.com/ajax/libs/require.js/2.1.10/require.min.js')
# -- Project information -----------------------------------------------------


Expand Down Expand Up @@ -106,7 +106,8 @@ def setup(app):
'sphinx.ext.todo',
'sphinx.ext.viewcode',
'nbsphinx',
'numpydoc'
'numpydoc',
# 'bokeh.sphinxext.bokeh_plot'
]

# Generate the API documentation when building
Expand Down Expand Up @@ -167,10 +168,10 @@ def setup(app):

# A list of tuples containing pages or urls to link to.
'navbar_links': [
("Quick Start", "quickstart"),
# ("Quick Start", "quickstart"),
("Documentation", "documentation"),
("API", "api"),
("Examples", "auto_examples/index"),
# ("Examples", "auto_examples/index"),
],

# Render the next and previous page links in navbar. (Default: true)
Expand Down
1 change: 1 addition & 0 deletions docs/source/documentation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
:maxdepth: 1

pyActigraphy-Intro.ipynb
pyActigraphy-Non-parametric-variables.ipynb
Loading

0 comments on commit 5b39008

Please sign in to comment.