summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/conf.py3
-rw-r--r--docs/requirements.txt1
-rwxr-xr-xsetup.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py
index d1e20119..0627f94c 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -163,6 +163,3 @@ texinfo_documents = [
# -- Options for Extensions -------------------------------------------
# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {'http://docs.python.org/': None}
-
-# Mock 3rd-party dependencies so they don't need to be installed for building docs
-autodoc_mock_imports = ['six']
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 210dfec5..8a8af629 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1,2 @@
pyparsing
+six
diff --git a/setup.py b/setup.py
index 5f9ede8a..696fc824 100755
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ CLASSIFIERS = filter(None, map(str.strip,
INSTALL_REQUIRES = ['pyparsing >= 2.0.1', 'six']
# unitest.mock was added in Python 3.3. mock is a backport of unittest.mock to all versions of Python
TESTS_REQUIRE = ['mock', 'pytest']
-DOCS_REQUIRE = ['sphinx', 'sphinx_rtd_theme', 'pyparsing']
+DOCS_REQUIRE = ['sphinx', 'sphinx_rtd_theme', 'pyparsing', 'six']
setup(
name="cmd2",