Skip to content

Commit

Permalink
Merge pull request #76 from philipstarkey/master
Browse files Browse the repository at this point in the history
fix docs conf bugs identified in labscript-suite/labscript-utils#57
  • Loading branch information
rpanderson authored Jun 22, 2020
2 parents 968afbc + 6439a26 commit 88eb635
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,10 @@

# whether to use stable or latest version
labscript_suite_doc_version = os.environ.get('READTHEDOCS_VERSION', 'latest')
if labscript_suite_doc_version not in ['stable', 'latest']:
if '.' in labscript_suite_doc_version:
labscript_suite_doc_version = 'stable'
elif labscript_suite_doc_version not in ['stable', 'latest']:
labscript_suite_doc_version = 'latest'

# add intersphinx references for each component
for ls_prog in labscript_suite_programs:
Expand Down Expand Up @@ -205,7 +207,7 @@ def setup(app):
app.add_config_value('m2r_anonymous_references', False, 'env')
app.add_config_value('m2r_disable_inline_math', False, 'env')
app.add_directive('mdinclude', MdInclude)
app.add_stylesheet('custom.css')
app.add_css_file('custom.css')

# generate the components.rst file dynamically so it points to stable/latest
# of subprojects correctly
Expand Down

0 comments on commit 88eb635

Please sign in to comment.