From afb50c7175f349f6edb835d60e9ced9670d01fe4 Mon Sep 17 00:00:00 2001 From: "Kostis Anagnostopoulos @ STUW025" Date: Mon, 19 Jan 2015 11:16:25 +0100 Subject: [PATCH] docs: FIX mock on python-2. for RTD - Print package-versions. - FIX Changes sub-titles. --- CHANGES.rst | 4 ++-- docs/conf.py | 40 ++++++++++++++++++++++++++++++++++-- requirements/readthedocs.txt | 1 + 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index d94e8728..1407fcb0 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -59,7 +59,7 @@ Changelog ========= v0.0.9-alpha.3 (1-Dec-2014) -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--------------------------- This is practically the 1st public releases, reworked in many parts, much better documented, continuously tested and build using TravisCI, with on-the-fly generated diagrams as metrics, BUT the arithmetic results produced are still identical to v0.0.7, so that the test-cases and @@ -89,7 +89,7 @@ Noteworthy or *incompatilble* changes v0.0.9-alpha.1 (1-Oct-2014) -~~~~~~~~~~~~~~~~~~~~~~~~~~~ +--------------------------- * Backported also to Python-2.7. * model, core: Discriminate between :term:`Test mass` from :term:`Unladen mass` (optionally auto-calced by ``driver_mass`` = 75(kg)). diff --git a/docs/conf.py b/docs/conf.py index d660d9fd..87f4801f 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -16,7 +16,40 @@ import re import sys, os, io - +print("python exec: %s"% sys.executable) +print("sys.path: %s"%sys.path) +try: + import numpy + print("numpy: %s, %s" % (numpy.__version__, numpy.__file__)) +except ImportError: + print("no numpy") +try: + import scipy + print("scipy: %s, %s" % (scipy.__version__, scipy.__file__)) +except ImportError: + print("no scipy") +try: + import pandas + print("pandas: %s, %s" % (pandas.__version__, pandas.__file__)) +except ImportError: + print("no pandas") +try: + import matplotlib + print("matplotlib: %s, %s" % (matplotlib.__version__, matplotlib.__file__)) +except ImportError: + print("no matplotlib") +try: + import IPython + print("ipython: %s, %s" % (IPython.__version__, IPython.__file__)) +except ImportError: + print("no ipython") +try: + import mock + print("mock: %s, %s" % (mock.__version__, mock.__file__)) +except ImportError: + print("no mock") + + projname = 'wltp' mydir = os.path.dirname(__file__) @@ -44,7 +77,10 @@ def read_project_version(): # Also tried but fails: http://blog.rtwilson.com/how-to-make-your-sphinx-documentation-compile-with-readthedocs-when-youre-using-numpy-and-scipy/ # if on_rtd: - from unittest.mock import MagicMock + try: + from unittest.mock import MagicMock + except ImportError: + from mock import Mock as MagicMock class Mock(MagicMock): @classmethod diff --git a/requirements/readthedocs.txt b/requirements/readthedocs.txt index a41e57b5..ced5dc43 100644 --- a/requirements/readthedocs.txt +++ b/requirements/readthedocs.txt @@ -3,4 +3,5 @@ six jsonschema >= 2.4 numpy pandas +mock matplotlib