Skip to content

Commit beece71

Browse files
author
abergeron
authored
Merge pull request #520 from abergeron/fix_doc2
Fix documentation build
2 parents 2d4a42c + 9b0413e commit beece71

File tree

4 files changed

+9
-12
lines changed

4 files changed

+9
-12
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ before_install:
2323
- export PREFIX=$HOME/.local
2424
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install doxygen; fi
2525
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PYTHONUSERBASE=$PREFIX; fi
26-
- pip install --user breathe sphinx==1.5.1 sphinx_rtd_theme cython numpy 'mako>=0.7' six
26+
- pip install --user breathe sphinx==1.6.3 sphinx_rtd_theme cython numpy 'mako>=0.7' six
2727
- export PATH=$PATH:$PREFIX/bin
2828
- export CPATH=$CPATH:$PREFIX/include
2929
- export LIBRARY_PATH=$LIBRARY_PATH:$PREFIX/lib

doc/c_api/group/group__context__flags.rst

Lines changed: 0 additions & 5 deletions
This file was deleted.

doc/conf.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,17 @@
5757
# |version| and |release|, also used in various other places throughout the
5858
# built documents.
5959
#
60+
61+
# We need this hokey-pokey because versioneer needs the current
62+
# directory to be the root of the project to work.
63+
_curpath = os.getcwd()
64+
os.chdir(os.path.dirname(os.path.dirname(__file__)))
6065
# The full version, including alpha/beta/rc tags.
6166
release = versioneer.get_version()
6267
# The short X.Y version.
6368
version = '.'.join(release.split('.')[:2])
69+
os.chdir(_curpath)
70+
del _curpath
6471

6572
# The language for content autogenerated by Sphinx. Refer to documentation
6673
# for a list of supported languages.
@@ -144,10 +151,6 @@ def setup(app):
144151
# using the given strftime format.
145152
html_last_updated_fmt = '%b %d, %Y'
146153

147-
# If true, SmartyPants will be used to convert quotes and dashes to
148-
# typographically correct entities.
149-
html_use_smartypants = True
150-
151154
# Custom sidebar templates, maps document names to template names.
152155
#html_sidebars = {}
153156

src/gpuarray/buffer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ GPUARRAY_PUBLIC int gpucontext_props_set_single_stream(gpucontext_props *p);
170170
* shared drives.
171171
*
172172
* \param p properties object
173+
* \param path desired location of the kernel cache
173174
*
174175
* \returns GA_NO_ERROR or an error code if an error occurred.
175176
*/
@@ -214,8 +215,6 @@ GPUARRAY_PUBLIC void gpucontext_props_del(gpucontext_props *p);
214215
*
215216
* \param res a pointer to a location that will be allocated
216217
* \param name the backend name.
217-
* \param dev the device number. The precise meaning of the device
218-
* number is backend-dependent
219218
* \param props a properties object for the context. Can be NULL for
220219
* defaults.
221220
*

0 commit comments

Comments
 (0)