Changes in / [dce368f:f2ea95a] in sasview

Files:

• .gitignore (modified) (1 diff)
• docs/sphinx-docs/Makefile (modified) (2 diffs)
• docs/sphinx-docs/build_sphinx.py (modified) (4 diffs)
• docs/sphinx-docs/convertKaTex.js (deleted)
• docs/sphinx-docs/source/_extensions/mathjax.py (deleted)
• docs/sphinx-docs/source/_static/rendermath.js (deleted)
• docs/sphinx-docs/source/conf.py (modified) (1 diff)
• src/sas/sasgui/guiframe/documentation_window.py (modified) (3 diffs)

.gitignore

@@ -49 +49 @@
 /docs/sphinx-docs/source/user/perspectives
 /docs/sphinx-docs/source/user/sasgui
-/docs/sphinx-docs/katex*.zip
 
 

docs/sphinx-docs/Makefile

@@ -16 +16 @@
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source-temp
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 # the i18n builder cannot share the environment and doctrees with the others
 I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
@@ -53 +53 @@
         rm -rf source/dev/api
         sphinx-apidoc -o source/dev/api -d 8 ../../src
-
+        
 html: stubs
         $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html

docs/sphinx-docs/build_sphinx.py

@@ -324 +324 @@
         print("!!!!NO MODEL DOCS WILL BE BUILT!!!!")
 
-def fetch_katex(version, destination="_static"):
-    from zipfile import ZipFile
-    import urllib2
-    url = "https://github.com/Khan/KaTeX/releases/download/%s/katex.zip" % version
-    cache_path = "katex_%s.zip" % version
-    if not os.path.exists(cache_path):
-        try:
-            fd_in = urllib2.urlopen(url)
-            with open(cache_path, "wb") as fd_out:
-                fd_out.write(fd_in.read())
-        finally:
-            fd_in.close()
-    with ZipFile(cache_path) as zip:
-        zip.extractall(destination)
 
 def retrieve_bumps_docs():
@@ -374 +360 @@
                      SASVIEW_BUILD])
 
-def build_pdf():
-    """
-    Runs sphinx-build for pdf.  Reads in all .rst files and spits out the final html.
-    """
-    print("=== Build PDF Docs from ReST Files ===")
-    subprocess.call(["sphinx-build",
-                     "-b", "latex", # Builder name. TODO: accept as arg to setup.py.
-                     "-d", os.path.join(SPHINX_BUILD, "doctrees"),
-                     SPHINX_SOURCE,
-                     os.path.join(SPHINX_BUILD, "latex")])
-
-    LATEXDIR = os.path.join(SPHINX_BUILD, "latex")
-    def pdflatex():
-        subprocess.call(["pdflatex", "Sasview.tex"], cwd=LATEXDIR)
-    pdflatex()
-    pdflatex()
-    pdflatex()
-    subprocess.call(["makeindex", "-s", "python.ist", "Sasview.idx"], cwd=LATEXDIR)
-    pdflatex()
-    pdflatex()
-
-    print("=== Copy PDF to HTML Directory ===")
-    source = os.path.join(LATEXDIR, "Sasview.pdf")
-    target = os.path.join(SASVIEW_DOCS, "Sasview.pdf")
-    shutil.copyfile(source, target)
-
 def build():
     """
     Runs sphinx-build.  Reads in all .rst files and spits out the final html.
     """
-    print("=== Build HTML Docs from ReST Files ===")
+    print("=== Build HTML Docs from Rest Files ===")
     subprocess.call(["sphinx-build",
                      "-b", "html", # Builder name. TODO: accept as arg to setup.py.
@@ -415 +375 @@
     copy_tree(html, SASVIEW_DOCS)
 
-def convert_katex():
-    print("=== Preprocess HTML, converting latex to html ===")
-    subprocess.call(["node", "convertKaTex.js", SASVIEW_DOCS])
+    #We are building latex doc on linux only
+    if "linux" in platform:
+        print "=== Build Latex Docs from Rest Files ==="
+        subprocess.call(["sphinx-build",
+                     "-b", "latex", # Builder name. TODO: accept as arg to setup.py.
+                     "-d", os.path.join(SPHINX_BUILD, "doctrees"),
+                     SPHINX_SOURCE,
+                     os.path.join(SPHINX_BUILD, "latex")])
+
+        print "=== Copy Latex Docs to Build Directory ==="
+        latex = os.path.join(SPHINX_BUILD, "latex")
+        copy_tree(latex, SASVIEW_DOCS)
 
 def rebuild():
@@ -424 +393 @@
     retrieve_user_docs()
     retrieve_bumps_docs()
-    fetch_katex(version=KATEX_VERSION, destination=KATEX_PARENT)
     apidoc()
     build()
-    #build_pdf()
-    #convert_katex()
 
     print("=== Done ===")

docs/sphinx-docs/source/conf.py

@@ -35 +35 @@
               'sphinx.ext.todo',
               'sphinx.ext.coverage',
-              'mathjax',
+              'sphinx.ext.mathjax',
               'dollarmath',
               'sphinx.ext.viewcode']
-
-#STATIC_PATH = '../../_static/'
-STATIC_PATH = ''
-mathjax_path = [
-    STATIC_PATH + 'katex/katex.min.js',
-    STATIC_PATH + 'katex/contrib/auto-render.min.js',
-    STATIC_PATH + 'rendermath.js'
-]
-mathjax_css = STATIC_PATH + 'katex/katex.min.css'
-
 
 # Add any paths that contain templates here, relative to this directory.

src/sas/sasgui/guiframe/documentation_window.py

@@ -16 +16 @@
 import os
 import logging
+import wx
 import webbrowser
 import urllib
 import sys
 
-import wx
-try:
-    import wx.html2 as html
-    WX_SUPPORTS_HTML2 = True
-except ImportError:
-    WX_SUPPORTS_HTML2 = False
-
-from .gui_manager import get_app_dir
-
 logger = logging.getLogger(__name__)
 
 SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
+WX_SUPPORTS_HTML2 = True
+try:
+    import wx.html2 as html
+except:
+    WX_SUPPORTS_HTML2 = False
 
-THREAD_STARTED = False
-def start_documentation_server(doc_root, port):
-    import thread
-    global THREAD_STARTED
-    if not THREAD_STARTED:
-        thread.start_new_thread(_documentation_server, (doc_root, port))
-        THREAD_STARTED = True
 
-def _documentation_server(doc_root, port):
-    from SimpleHTTPServer import SimpleHTTPRequestHandler
-    from SocketServer import TCPServer
+from gui_manager import get_app_dir
 
-    os.chdir(doc_root)
-    httpd = TCPServer(("127.0.0.1", port), SimpleHTTPRequestHandler, bind_and_activate=False)
-    httpd.allow_reuse_address = True
-    try:
-        httpd.server_bind()
-        httpd.server_activate()
-        httpd.serve_forever()
-    finally:
-        httpd.server_close()
 
 class DocumentationWindow(wx.Frame):
@@ -91 +70 @@
         #Note added June 21, 2015     PDB
         file_path = os.path.join(docs_path, path)
-        if path.startswith('http'):
-            url = path
-        elif not os.path.exists(file_path):
-            url = "index.html"
+        url = "file:///" + urllib.quote(file_path, r'/\:')+ url_instruction
+
+        if not os.path.exists(file_path):
             logger.error("Could not find Sphinx documentation at %s \
             -- has it been built?", file_path)
-        elif True:
-            start_documentation_server(docs_path, port=7999)
-            url = "http://localhost:7999/" + path.replace('\\', '/') + url_instruction
-        else:
-            url = "file:///" + urllib.quote(file_path, r'/\:')+ url_instruction
-
-        logger.info("showing url " + url)
-        if WX_SUPPORTS_HTML2:
+        elif WX_SUPPORTS_HTML2:
             # Complete HTML/CSS support!
             self.view = html.WebView.New(self)
             self.view.LoadURL(url)
-            self.Bind(html.EVT_WEBVIEW_ERROR, self.OnError, self.view)
             self.Show()
         else:
@@ -118 +88 @@
             webbrowser.open_new_tab(url)
 
-    def OnError(self, evt):
-        logger.error("%d: %s", evt.GetInt(), evt.GetString())
-
 def main():
     """
     main loop function if running alone for testing.
     """
-    url = "index.html" if len(sys.argv) <= 1 else sys.argv[1]
     app = wx.App()
-    DocumentationWindow(None, -1, url, "", "Documentation",)
+    DocumentationWindow(None, -1, "index.html", "", "Documentation",)
     app.MainLoop()