Skip to content

Commit

Permalink
Merge pull request #287 from jburel/sphinx_version
Browse files Browse the repository at this point in the history
Fix installation
  • Loading branch information
jburel committed Mar 6, 2024
2 parents fd0642e + 972b54d commit 55de79a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
21 changes: 11 additions & 10 deletions conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
'sphinx.ext.autosummary',
'sphinx.ext.doctest',
'sphinx.ext.inheritance_diagram',
"sphinx_rtd_theme"]
'sphinx_rtd_theme']


# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand All @@ -51,16 +52,16 @@

# General information about the project.
project = u'OMERO guide'
copyright = u'2019, Open Microscopy Environment'
copyright = u'2019-2024, Open Microscopy Environment'

# 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.2.0'
version = '2023.07.19'
# The full version, including alpha/beta/rc tags.
release = '0.2.0'
release = '2023.07.19'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down Expand Up @@ -192,11 +193,11 @@
# This is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = None

html_context = {
'css_files': [
'_static/theme_overrides.css', # override wide tables in RTD theme
],
}
#html_context = {
# 'css_files': [
# '_static/theme_overrides.css', # override wide tables in RTD theme
# ],
# }
# Output file base name for HTML help builder.
htmlhelp_basename = 'OMEROguidedoc'

Expand Down Expand Up @@ -360,5 +361,5 @@
.. _matlab: matlab/docs/index.html
.. _python: python/docs/index.html
.. _java: java/docs/index.html
.. |insight_version| replace:: 5.5.15
"""
2 changes: 1 addition & 1 deletion external_tools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ or the API of those tools.
- :doc:`fiji/docs/index`
- .. include:: fiji/docs/index.rst
:start-line: 3
:end-before: Contents
:end-before: Install
* - \ |ilastik|_
- :doc:`ilastik/docs/index`
- .. include:: ilastik/docs/index.rst
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Sphinx==4.2.0
sphinx-rtd-theme
Sphinx==7.2.6
sphinx-rtd-theme==2.0.0

0 comments on commit 55de79a

Please sign in to comment.