diff --git a/.saltstack/salt/hshetldocs/init.sls b/.saltstack/salt/hshetldocs/init.sls index 2d0f1993804cf957b5ddee07d338646b7d0f2d25..21e1dd306a46d7dcaa032fb55a8b6b2c63e932e7 100644 --- a/.saltstack/salt/hshetldocs/init.sls +++ b/.saltstack/salt/hshetldocs/init.sls @@ -7,7 +7,6 @@ hshetldocs_git: hshetldocs_prereq: pkg.installed: - pkgs: - - python-sphinx - build-essential - python-virtualenv @@ -15,7 +14,6 @@ hshetldocs_virtualenv: virtualenv.managed: - name: /srv/env/hshetl - python: /usr/bin/python2 - - system_site_packages: False - requirements: /srv/hshetl/requirements.txt - require: - git: hshetldocs_git diff --git a/docs/source/conf.py b/docs/source/conf.py index d6a53f676ce62d9db298d1dca259663315e51020..65112c1b3d546ee8021d4e4ef8df440d058b91dd 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -30,7 +30,7 @@ sys.path.append(os.path.dirname(__file__) + '/../../') # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode', 'sphinxarg.ext', 'sphinx.ext.graphviz', 'sphinx.ext.inheritance_diagram'] +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.intersphinx', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode', 'sphinx.ext.graphviz', 'sphinx.ext.inheritance_diagram'] # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] diff --git a/requirements.txt b/requirements.txt index cb3c1f2e3efe7e4cea5f8050aec610563a4927a5..2806c164989aa9137a6c1860716ae9abccef75ad 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -sphinx-argparse +Sphinx