From: Clancy R. <cwr...@pr...> - 2014-12-01 00:34:26
|
Branch: refs/heads/improve-docs Home: https://github.com/python-control/python-control Commit: 1a470fa687bbc4240e675d1292644ac81e11fc79 https://github.com/python-control/python-control/commit/1a470fa687bbc4240e675d1292644ac81e11fc79 Author: Clancy Rowley <cwr...@pr...> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: A doc-requirements.txt Log Message: ----------- Add requirements file for readthedocs.org Commit: d563d98638d548399e75044d4d6b52519d7c6007 https://github.com/python-control/python-control/commit/d563d98638d548399e75044d4d6b52519d7c6007 Author: Clancy Rowley <cwr...@pr...> Date: 2014-11-30 (Sun, 30 Nov 2014) Changed paths: M doc/class_strings.rst M doc/conf.py M doc/creation.rst M doc/freqplot.rst M doc/matlab_strings.rst M doc/timeresp.rst Log Message: ----------- Fix dependencies and mocks in sphinx documentation There was an error in the way the sphinx documentation was configured that prevented it from building correctly, now that absolute imports (e.g., "from control import lti") have been changed to relative imports (e.g., "from . import lti"). In particular, the directory "root/control" should not be added to sys.path. Because this directory contains an __init__.py file, it is a Python package, and packages should never be added to the path, or lots of strange things happen, particularly with relative imports. Instead, the directory "root" should be added to the path. This change was made in the conf.py file. Also, the mocks for modules were fixed so that the documentation builds even if numpy, scipy, etc are not installed. Conflicts: doc/conf.py Compare: https://github.com/python-control/python-control/compare/1a470fa687bb^...d563d98638d5 |