Commit b0f4c16e authored by L.S. Cook's avatar L.S. Cook Committed by Scott Cyphers

fix Sphinx version for Jenkins and update nG versioning (#1640)

* fix Sphinx version for Jenkins and update nG versioning

* Try stable verison of Sphinx 1.7 instead

* postpone adding dropout op to make CI building happy
parent d52473c8
...@@ -30,7 +30,7 @@ RUN yum -y update && \ ...@@ -30,7 +30,7 @@ RUN yum -y update && \
cmake3 make \ cmake3 make \
git \ git \
wget patch diffutils zlib-devel ncurses-devel libtinfo-dev \ wget patch diffutils zlib-devel ncurses-devel libtinfo-dev \
python python-devel python-setuptools \ python python-devel python3-sphinx python-setuptools \
doxygen graphviz \ doxygen graphviz \
which \ which \
'perl(Data::Dumper)' 'perl(Data::Dumper)'
......
...@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \ ...@@ -24,7 +24,7 @@ RUN apt-get update && apt-get install -y \
git \ git \
wget patch diffutils zlib1g-dev libtinfo-dev \ wget patch diffutils zlib1g-dev libtinfo-dev \
doxygen graphviz \ doxygen graphviz \
python-pip python-pip python3-pip
RUN apt-get clean autoclean && \ RUN apt-get clean autoclean && \
apt-get autoremove -y apt-get autoremove -y
...@@ -35,7 +35,7 @@ RUN pip install --upgrade pip ...@@ -35,7 +35,7 @@ RUN pip install --upgrade pip
# added install for python-pip above and # added install for python-pip above and
# installed sphinx with pip to get the updated version 1.6.5 # installed sphinx with pip to get the updated version 1.6.5
# allows for make html build under the doc/source directory as an interim build process # allows for make html build under the doc/source directory as an interim build process
RUN pip install sphinx RUN pip install sphinx==1.7.5
RUN pip install breathe RUN pip install breathe
# need numpy to successfully build docs for python_api # need numpy to successfully build docs for python_api
......
...@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.abspath('../../../python')) ...@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.abspath('../../../python'))
# If your documentation needs a minimal Sphinx version, state it here. # If your documentation needs a minimal Sphinx version, state it here.
# #
needs_sphinx = '1.6.5' needs_sphinx = '1.7.5'
# Add any Sphinx extension module names here, as strings. They can be # Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
...@@ -37,7 +37,6 @@ extensions = [ ...@@ -37,7 +37,6 @@ extensions = [
'sphinx.ext.autodoc', 'sphinx.ext.autodoc',
'sphinx.ext.autosummary', 'sphinx.ext.autosummary',
'sphinx.ext.mathjax', 'sphinx.ext.mathjax',
# 'sphinx.ext.numpy',
'sphinx.ext.ifconfig', 'sphinx.ext.ifconfig',
'sphinx.ext.viewcode', 'sphinx.ext.viewcode',
'breathe', 'breathe',
...@@ -69,9 +68,9 @@ author = 'Intel Corporation' ...@@ -69,9 +68,9 @@ author = 'Intel Corporation'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.7' version = '0.8'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.7.1' release = '0.8.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment