Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
8dfd3781
Commit
8dfd3781
authored
6 years ago
by
Marina Ganeva
Browse files
Options
Downloads
Patches
Plain Diff
Re #23953 use LooseVersion for version comparison
parent
a955a771
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dev-docs/source/conf.py
+3
-2
3 additions, 2 deletions
dev-docs/source/conf.py
docs/source/conf.py
+3
-2
3 additions, 2 deletions
docs/source/conf.py
with
6 additions
and
4 deletions
dev-docs/source/conf.py
+
3
−
2
View file @
8dfd3781
...
...
@@ -7,11 +7,12 @@ import os
from
sphinx
import
__version__
as
sphinx_version
import
sphinx_bootstrap_theme
from
distutils.version
import
LooseVersion
# -- General configuration ------------------------------------------------
if
sphinx_version
>
"
1.6
"
:
if
LooseVersion
(
sphinx_version
)
>
LooseVersion
(
"
1.6
"
)
:
def
setup
(
app
):
"""
Called automatically by Sphinx when starting the build process
"""
...
...
@@ -28,7 +29,7 @@ extensions = [
'
sphinx.ext.intersphinx
'
]
if
sphinx_version
>
"
1.8
"
:
if
LooseVersion
(
sphinx_version
)
>
LooseVersion
(
"
1.8
"
)
:
extensions
.
append
(
'
sphinx.ext.imgmath
'
)
else
:
extensions
.
append
(
'
sphinx.ext.pngmath
'
)
...
...
This diff is collapsed.
Click to expand it.
docs/source/conf.py
+
3
−
2
View file @
8dfd3781
...
...
@@ -9,6 +9,7 @@ from sphinx import __version__ as sphinx_version
import
sphinx_bootstrap_theme
# checked at cmake time
import
mantid
from
mantid.kernel
import
ConfigService
from
distutils.version
import
LooseVersion
# 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
...
...
@@ -17,7 +18,7 @@ sys.path.insert(0, os.path.abspath(os.path.join('..', 'sphinxext')))
# -- General configuration ------------------------------------------------
if
sphinx_version
>
"
1.6
"
:
if
LooseVersion
(
sphinx_version
)
>
LooseVersion
(
"
1.6
"
)
:
def
setup
(
app
):
"""
Called automatically by Sphinx when starting the build process
"""
...
...
@@ -38,7 +39,7 @@ extensions = [
'
mantiddoc.doctest
'
,
'
matplotlib.sphinxext.plot_directive
'
]
if
sphinx_version
>
"
1.8
"
:
if
LooseVersion
(
sphinx_version
)
>
LooseVersion
(
"
1.8
"
)
:
extensions
.
append
(
'
sphinx.ext.imgmath
'
)
else
:
extensions
.
append
(
'
sphinx.ext.pngmath
'
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment