Changeset a42fb8e in sasview for docs/sphinx-docs


Ignore:
Timestamp:
Apr 11, 2017 7:49:13 AM (8 years ago)
Author:
GitHub <noreply@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
6ca9d90, 7b15990
Parents:
f028ca9 (diff), 14bb7a4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Andrew Jackson <andrew.jackson@…> (04/11/17 07:49:13)
git-committer:
GitHub <noreply@…> (04/11/17 07:49:13)
Message:

Merge pull request #87 from SasView?/ticket-555

Closes #555

Location:
docs/sphinx-docs
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/build_sphinx.py

    r751f4bd r01f1e17  
    66http://sphinx-doc.org/invocation.html 
    77""" 
     8from __future__ import print_function 
     9 
    810import subprocess 
    911import os 
    … …  
    1214import shutil 
    1315import imp 
     16 
    1417from glob import glob 
    15  
    1618from distutils.dir_util import copy_tree 
    1719from distutils.util import get_platform 
    … …  
    5557SASMODELS_DEST_BUILDIMG = os.path.join(SASMODELS_DEST_PROLOG, "user", "models", "img") 
    5658 
    57 #if os.path.exists(SASMODELS_SOURCE_PROLOG): 
    58 #    print "Found models prolog folder at ", SASMODELS_SOURCE_PROLOG 
    59 #if os.path.exists(SASMODELS_SOURCE_REF_MODELS): 
    60 #    print "Found models ref folder at ", SASMODELS_SOURCE_REF_MODELS 
    61 #if os.path.exists(SASMODELS_SOURCE_MODELS): 
    62 #    print "Found models folder at ", SASMODELS_SOURCE_MODELS 
    63 #if os.path.exists(SASMODELS_SOURCE_IMG): 
    64 #    print "Found img folder at ", SASMODELS_SOURCE_IMG 
    65 #if os.path.exists(SASMODELS_DEST_REF_MODELS): 
    66 #    print "Found models ref folder at ", SASMODELS_DEST_REF_MODELS 
    67 #if os.path.exists(SASMODELS_DEST_MODELS): 
    68 #    print "Found models folder at ", SASMODELS_DEST_MODELS 
    69 #if os.path.exists(SASMODELS_DEST_IMG): 
    70 #    print "Found img folder at ", SASMODELS_DEST_IMG 
    71 #sys.exit() 
    7259 
    7360SPHINX_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build") 
    … …  
    8875        s=open(filename).read() 
    8976        if old_string in s: 
    90                 print 'Changing "{old_string}" to "{new_string}"'.format(**locals()) 
     77                print('Changing "{old_string}" to "{new_string}"'.format(**locals())) 
    9178                s=s.replace(old_string, new_string) 
    9279                f=open(filename, 'w') 
    … …  
    9582                f.close() 
    9683        else: 
    97                 print 'No occurences of "{old_string}" found.'.format(**locals()) 
     84                print('No occurences of "{old_string}" found.'.format(**locals())) 
    9885 
    9986def _remove_dir(dir_path): 
    10087    """Removes the given directory.""" 
    10188    if os.path.isdir(dir_path): 
    102         print "Removing \"%s\"... " % dir_path 
     89        print("Removing \"%s\"... " % dir_path) 
    10390        shutil.rmtree(dir_path) 
    10491 
    … …  
    10794    Clean the sphinx build directory. 
    10895    """ 
    109     print "=== Cleaning Sphinx Build ===" 
     96    print("=== Cleaning Sphinx Build ===") 
    11097    _remove_dir(SASVIEW_DOCS) 
    11198    _remove_dir(SPHINX_BUILD) 
    … …  
    120107    Copy the source toctrees to new folder for assembling the sphinx-docs 
    121108    """ 
    122     print "=== Copying Source toctrees ===" 
     109    print("=== Copying Source toctrees ===") 
    123110    if os.path.exists(SASVIEW_TOC_SOURCE): 
    124        print "Found docs folder at ", SASVIEW_TOC_SOURCE 
     111       print("Found docs folder at", SASVIEW_TOC_SOURCE) 
    125112       shutil.copytree(SASVIEW_TOC_SOURCE, SPHINX_SOURCE) 
    126113 
    … …  
    141128    so that Sphinx may pick it up when generating the documentation. 
    142129    """ 
    143     print "=== Retrieve User Docs ===" 
     130    print("=== Retrieve User Docs ===") 
    144131 
    145132    # Copy documentation files from their "source" to their "destination". 
    … …  
    148135 
    149136            docs = os.path.abspath(os.path.join(root, dirname)) 
    150             print "Found docs folder at \"%s\"." % docs 
     137            print("Found docs folder at \"%s\"." % docs) 
    151138 
    152139            dest_dir_part = os.path.dirname(os.path.relpath(docs, SASVIEW_SRC)) 
    … …  
    158145 
    159146    # Now pickup testdata_help.rst 
    160 #    print os.path.abspath(SASVIEW_TEST) 
    161 #    print os.path.abspath(SPHINX_SOURCE_TEST) 
    162     print "=== Including Test Data Docs ===" 
     147    print("=== Including Test Data Docs ===") 
    163148    if os.path.exists(SASVIEW_TEST): 
    164        print "Found docs folder at ", SASVIEW_TEST 
     149       print("Found docs folder at", SASVIEW_TEST) 
    165150       shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST) 
    166151 
    167     print "=== And the Sasmodels Docs ===" 
     152    print("=== And the Sasmodels Docs ===") 
    168153    # Make sure we have the relevant images for the new sasmodels documentation 
    169154    # First(!) we'll make a local reference copy for SasView (/new-models will be cleaned each build) 
    170155    if os.path.exists(SASMODELS_SOURCE_IMG): 
    171         print "Found img  folder SASMODELS_SOURCE_IMG    at ", SASMODELS_SOURCE_IMG 
     156        print("Found img folder SASMODELS_SOURCE_IMG at", SASMODELS_SOURCE_IMG) 
    172157        if not os.path.exists(SASMODELS_DEST_IMG): 
    173             print "Missing docs folder SASMODELS_DEST_IMG at ", SASMODELS_DEST_IMG 
     158            print("Missing docs folder SASMODELS_DEST_IMG at", SASMODELS_DEST_IMG) 
    174159            os.makedirs(SASMODELS_DEST_IMG) 
    175             print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG 
    176         else: print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG 
    177         print "Copying sasmodels model image files..." 
     160            print("created SASMODELS_DEST_BUILDIMG at", SASMODELS_DEST_BUILDIMG) 
     161        else: 
     162            print("Found img folder SASMODELS_DEST_IMG at", SASMODELS_DEST_IMG) 
     163        print("Copying sasmodels model image files...") 
    178164        for files in os.listdir(SASMODELS_SOURCE_IMG): 
    179165            fromhere=os.path.join(SASMODELS_SOURCE_IMG,files) 
    180166            tohere=os.path.join(SASMODELS_DEST_IMG,files) 
    181167            shutil.copy(fromhere,tohere) 
    182     else: print "cannot find SASMODELS_SOURCE_IMG", SASMODELS_SOURCE_IMG 
     168    else: 
     169        print("no source directory",SASMODELS_SOURCE_IMG,"was found") 
    183170 
    184171    if os.path.exists(SASMODELS_SOURCE_AUTOIMG): 
    185         print "Found img  folder SASMODELS_SOURCE_AUTOIMG    at ", SASMODELS_SOURCE_AUTOIMG 
     172        print("Found img folder SASMODELS_SOURCE_AUTOIMG at", SASMODELS_SOURCE_AUTOIMG) 
    186173        if not os.path.exists(SASMODELS_DEST_IMG): 
    187             print "Missing docs folder SASMODELS_DEST_IMG at ", SASMODELS_DEST_IMG 
     174            print("Missing docs folder SASMODELS_DEST_IMG at", SASMODELS_DEST_IMG) 
    188175            os.makedirs(SASMODELS_DEST_BUILDIMG) 
    189             print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG 
    190         print "Copying sasmodels model auto-generated image files..." 
     176            print("created SASMODELS_DEST_BUILDIMG at", SASMODELS_DEST_BUILDIMG) 
     177        print("Copying sasmodels model auto-generated image files...") 
    191178        for files in os.listdir(SASMODELS_SOURCE_AUTOIMG): 
    192179            fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files) 
    193180            tohere=os.path.join(SASMODELS_DEST_IMG,files) 
    194181            shutil.copy(fromhere,tohere) 
    195     else: print "no source directory",SASMODELS_SOURCE_AUTOIMG ,"was found" 
     182    else: 
     183        print("no source directory",SASMODELS_SOURCE_AUTOIMG ,"was found") 
    196184 
    197185    # And the rst prolog with the unit substitutions 
    198186    if os.path.exists(SASMODELS_SOURCE_PROLOG): 
    199         print "Found prolog folder SASMODELS_SOURCE_PROLOG at ", SASMODELS_SOURCE_PROLOG 
     187        print("Found prolog folder SASMODELS_SOURCE_PROLOG at", SASMODELS_SOURCE_PROLOG) 
    200188        if os.path.exists(SASMODELS_DEST_PROLOG): 
    201             print "Found docs folder SASMODELS_DEST_PROLOG   at ", SASMODELS_DEST_PROLOG 
    202             print "Copying sasmodels rst_prolog file..." 
     189            print("Found docs folder SASMODELS_DEST_PROLOG at", SASMODELS_DEST_PROLOG) 
     190            print("Copying sasmodels rst_prolog file...") 
    203191            for files in os.listdir(SASMODELS_SOURCE_PROLOG): 
    204192                if files.startswith("rst"): 
    … …  
    206194                    tohere=os.path.join(SASMODELS_DEST_PROLOG,files) 
    207195                    shutil.copy(fromhere,tohere) 
     196    else: 
     197        print("no source directory",SASMODELS_SOURCE_PROLOG, "was found") 
    208198 
    209199    if os.path.exists(SASMODELS_SOURCE_GPU): 
    210         print "Found docs folder SASMODELS_SOURCE_GPU at ", SASMODELS_SOURCE_GPU 
     200        print("Found docs folder SASMODELS_SOURCE_GPU at", SASMODELS_SOURCE_GPU) 
    211201        if os.path.exists(SPHINX_SOURCE_USER): 
    212             print "Found docs folder SPHINX_SOURCE_USER      at ", SPHINX_SOURCE_USER 
    213             print "Copying sasmodels gpu files..." 
     202            print("Found docs folder SPHINX_SOURCE_USER at", SPHINX_SOURCE_USER) 
     203            print("Copying sasmodels gpu files...") 
    214204            for files in os.listdir(SASMODELS_SOURCE_GPU): 
    215205                if files.endswith(".rst"): 
    … …  
    217207                    tohere=os.path.join(SPHINX_SOURCE_USER,files) 
    218208                    shutil.copy(fromhere,tohere) 
     209    else: 
     210        print("no source directory",SASMODELS_SOURCE_GPU,"was found") 
    219211 
    220212    if os.path.exists(SASMODELS_SOURCE_SESANS): 
    221         print "Found docs folder SASMODELS_SOURCE_SESANS at ", SASMODELS_SOURCE_SESANS 
     213        print("Found docs folder SASMODELS_SOURCE_SESANS at", SASMODELS_SOURCE_SESANS) 
    222214        if os.path.exists(SPHINX_SOURCE_USER): 
    223             print "Found docs folder SPHINX_SOURCE_USER      at ", SPHINX_SOURCE_USER 
    224             print "Copying sasmodels sesans files..." 
     215            print("Found docs folder SPHINX_SOURCE_USER at", SPHINX_SOURCE_USER) 
     216            print("Copying sasmodels sesans files...") 
    225217            for files in os.listdir(SASMODELS_SOURCE_SESANS): 
    226218                if files.endswith(".rst"): 
    … …  
    228220                    tohere=os.path.join(SPHINX_SOURCE_USER,files) 
    229221                    shutil.copy(fromhere,tohere) 
     222    else: 
     223        print("no source directory",SASMODELS_SOURCE_SESANS,"was found") 
    230224 
    231225    if os.path.exists(SASMODELS_SOURCE_MAGNETISM): 
    232         print "Found docs folder SASMODELS_SOURCE_MAGNETISM at ", SASMODELS_SOURCE_MAGNETISM 
     226        print("Found docs folder SASMODELS_SOURCE_MAGNETISM at", SASMODELS_SOURCE_MAGNETISM) 
    233227        if os.path.exists(SASMODELS_DEST_REF_MODELS): 
    234             print "Found docs folder SASMODELS_DEST_REF_MODELS   at ", SASMODELS_DEST_REF_MODELS 
    235             print "Copying sasmodels model toctree files..." 
     228            print("Found docs folder SASMODELS_DEST_REF_MODELS at", SASMODELS_DEST_REF_MODELS) 
     229            print("Copying sasmodels model toctree files...") 
    236230            for files in os.listdir(SASMODELS_SOURCE_MAGNETISM): 
    237231                if files.endswith(".rst"): 
    … …  
    239233                    tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files) 
    240234                    shutil.copy(fromhere,tohere) 
     235    else: 
     236        print("no source directory",SASMODELS_SOURCE_MAGNETISM,"was found") 
    241237 
    242238    if os.path.exists(SASMODELS_SOURCE_MAGIMG): 
    243         print "Found img folder SASMODELS_SOURCE_MAGIMG   at ", SASMODELS_SOURCE_MAGIMG 
     239        print("Found img folder SASMODELS_SOURCE_MAGIMG   at", SASMODELS_SOURCE_MAGIMG) 
    244240        if not os.path.exists(SASMODELS_DEST_MAGIMG): 
    245             print "Missing img folder SASMODELS_DEST_MAGIMG at ", SASMODELS_DEST_MAGIMG 
     241            print("Missing img folder SASMODELS_DEST_MAGIMG at", SASMODELS_DEST_MAGIMG) 
    246242            os.makedirs(SASMODELS_DEST_MAGIMG) 
    247             print "created SASMODELS_DEST_MAGIMG at ", SASMODELS_DEST_MAGIMG 
    248         print "Copying sasmodels mag image files..." 
     243            print("created SASMODELS_DEST_MAGIMG at", SASMODELS_DEST_MAGIMG) 
     244        print("Copying sasmodels mag image files...") 
    249245        for files in os.listdir(SASMODELS_SOURCE_MAGIMG): 
    250246            fromhere=os.path.join(SASMODELS_SOURCE_MAGIMG,files) 
    251247            tohere=os.path.join(SASMODELS_DEST_MAGIMG,files) 
    252248            shutil.copy(fromhere,tohere) 
    253     else: print "no source directory",SASMODELS_SOURCE_MAGIMG ,"was found" 
     249    else: 
     250        print("no source directory",SASMODELS_SOURCE_MAGIMG ,"was found") 
    254251 
    255252    if os.path.exists(SASMODELS_SOURCE_SESANSIMG): 
    256         print "Found img folder SASMODELS_SOURCE_SESANSIMG   at ", SASMODELS_SOURCE_SESANSIMG 
     253        print("Found img folder SASMODELS_SOURCE_SESANSIMG at", SASMODELS_SOURCE_SESANSIMG) 
    257254        if not os.path.exists(SASMODELS_DEST_SESANSIMG): 
    258             print "Missing img folder SASMODELS_DEST_SESANSIMG at ", SASMODELS_DEST_SESANSIMG 
     255            print("Missing img folder SASMODELS_DEST_SESANSIMG at", SASMODELS_DEST_SESANSIMG) 
    259256            os.makedirs(SASMODELS_DEST_SESANSIMG) 
    260             print "created SASMODELS_DEST_SESANSIMG at ", SASMODELS_DEST_SESANSIMG 
    261         print "Copying sasmodels sesans image files..." 
     257            print("created SASMODELS_DEST_SESANSIMG at", SASMODELS_DEST_SESANSIMG) 
     258        print("Copying sasmodels sesans image files...") 
    262259        for files in os.listdir(SASMODELS_SOURCE_SESANSIMG): 
    263260            fromhere=os.path.join(SASMODELS_SOURCE_SESANSIMG,files) 
    264261            tohere=os.path.join(SASMODELS_DEST_SESANSIMG,files) 
    265262            shutil.copy(fromhere,tohere) 
    266     else: print "no source directory",SASMODELS_SOURCE_SESANSIMG ,"was found" 
     263    else: 
     264        print("no source directory",SASMODELS_SOURCE_SESANSIMG ,"was found") 
    267265 
    268266    if os.path.exists(SASMODELS_SOURCE_REF_MODELS): 
    269         print "Found docs folder SASMODELS_SOURCE_REF_MODELS at ", SASMODELS_SOURCE_REF_MODELS 
     267        print("Found docs folder SASMODELS_SOURCE_REF_MODELS at", SASMODELS_SOURCE_REF_MODELS) 
    270268        if os.path.exists(SASMODELS_DEST_REF_MODELS): 
    271             print "Found docs folder SASMODELS_DEST_REF_MODELS   at ", SASMODELS_DEST_REF_MODELS 
    272             print "Copying sasmodels model toctree files..." 
     269            print("Found docs folder SASMODELS_DEST_REF_MODELS at", SASMODELS_DEST_REF_MODELS) 
     270            print("Copying sasmodels model toctree files...") 
    273271            for files in os.listdir(SASMODELS_SOURCE_REF_MODELS): 
    274272                if files.endswith(".rst"): 
    … …  
    276274                    tohere=os.path.join(SASMODELS_DEST_REF_MODELS,files) 
    277275                    shutil.copy(fromhere,tohere) 
    278     # But need to change the path to the model docs in the tocs 
    279     for files in os.listdir(SASMODELS_DEST_REF_MODELS): 
    280 #        print files 
    281         if files.startswith("shape"): 
    282             print "Changing toc paths in", files 
    283             inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
    284         if files.startswith("sphere"): 
    285             print "Changing toc paths in", files 
    286             inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
    287         if files.startswith("custom"): 
    288             print "Changing toc paths in", files 
    289             inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
    290         if files.startswith("structure"): 
    291             print "Changing toc paths in", files 
    292             inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
     276            # But need to change the path to the model docs in the tocs 
     277            for files in os.listdir(SASMODELS_DEST_REF_MODELS): 
     278        #        print files 
     279                if files.startswith("shape"): 
     280                    print("Changing toc paths in", files) 
     281                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
     282                if files.startswith("sphere"): 
     283                    print("Changing toc paths in", files) 
     284                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
     285                if files.startswith("custom"): 
     286                    print("Changing toc paths in", files) 
     287                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
     288                if files.startswith("structure"): 
     289                    print("Changing toc paths in", files) 
     290                    inplace_change(os.path.join(SASMODELS_DEST_REF_MODELS,files), "../../model/", "models/") 
     291    else: 
     292        print("no source directory",SASMODELS_SOURCE_REF_MODELS," was found") 
    293293 
    294294    if os.path.exists(SASMODELS_SOURCE_MODELS): 
    295         print "Found docs folder SASMODELS_SOURCE_MODELS at ", SASMODELS_SOURCE_MODELS 
     295        print("Found docs folder SASMODELS_SOURCE_MODELS at", SASMODELS_SOURCE_MODELS) 
    296296        if os.path.exists(SASMODELS_DEST_MODELS): 
    297             print "Found docs folder SASMODELS_DEST_MODELS   at ", SASMODELS_DEST_MODELS 
    298             print "Copying sasmodels model files..." 
     297            print("Found docs folder SASMODELS_DEST_MODELS at", SASMODELS_DEST_MODELS) 
     298            print("Copying sasmodels model files...") 
    299299            for files in os.listdir(SASMODELS_SOURCE_MODELS): 
    300300                if files.endswith(".rst"): 
    … …  
    303303                    shutil.copy(fromhere,tohere) 
    304304        else: 
    305             print "Missing docs folder SASMODELS_DEST_MODELS at ", SASMODELS_DEST_MODELS 
     305            print("Missing docs folder SASMODELS_DEST_MODELS at", SASMODELS_DEST_MODELS) 
    306306            os.makedirs(SASMODELS_DEST_MODELS) 
    307307            if not os.path.exists(SASMODELS_DEST_BUILDIMG): 
    308308                os.makedirs(SASMODELS_DEST_BUILDIMG) 
    309             print "Created docs folder SASMODELS_DEST_MODELS at ", SASMODELS_DEST_MODELS 
    310             print "Copying model files for build..." 
     309            print("Created docs folder SASMODELS_DEST_MODELS at", SASMODELS_DEST_MODELS) 
     310            print("Copying model files for build...") 
    311311            for files in os.listdir(SASMODELS_SOURCE_MODELS): 
    312312                if files.endswith(".rst"): 
    … …  
    315315                    shutil.copy(fromhere,tohere) 
    316316            # No choice but to do this because model files are all coded for images in /models/img 
    317             print "Copying image files for build..." 
     317            print("Copying image files for build...") 
    318318            for files in os.listdir(SASMODELS_DEST_IMG): 
    319319                fromhere=os.path.join(SASMODELS_DEST_IMG,files) 
    320320                tohere=os.path.join(SASMODELS_DEST_BUILDIMG,files) 
    321321                shutil.copy(fromhere,tohere) 
     322    else: 
     323        print("no source directory",SASMODELS_SOURCE_MODELS,"was found.") 
     324        print("!!!!NO MODEL DOCS WILL BE BUILT!!!!") 
    322325 
    323326 
    … …  
    327330    """ 
    328331    if os.path.exists(BUMPS_DOCS): 
    329         print "=== Retrieve BUMPS Docs ===" 
     332        print("=== Retrieve BUMPS Docs ===") 
    330333        filenames = [os.path.join(BUMPS_DOCS, "optimizer.rst")] 
    331334        filenames += glob(os.path.join(BUMPS_DOCS, "dream-*.png")) 
    332335        filenames += glob(os.path.join(BUMPS_DOCS, "fit-*.png")) 
    333336        for f in filenames: 
    334             print "Copying file", f 
     337            print("Copying file", f) 
    335338            shutil.copy(f, BUMPS_TARGET) 
    336339    else: 
    337         print """ 
    338 *** Error *** missing directory %s 
     340        print(""" 
     341======= Error ======= 
     342missing directory %s 
    339343The documentation will not include the optimizer selection section. 
    340344Checkout the bumps source tree and rebuild the docs. 
    341  
    342  
    343 """ % BUMPS_DOCS 
     345""" % BUMPS_DOCS) 
    344346 
    345347def apidoc(): 
    … …  
    348350    in the SasView build directory. 
    349351    """ 
    350     print "=== Generate API Rest Files ===" 
     352    print("=== Generate API Rest Files ===") 
    351353 
    352354    # Clean directory before generating a new version. 
    … …  
    362364    Runs sphinx-build.  Reads in all .rst files and spits out the final html. 
    363365    """ 
    364     print "=== Build HTML Docs from Rest Files ===" 
     366    print("=== Build HTML Docs from Rest Files ===") 
    365367    subprocess.call(["sphinx-build", 
    366368                     "-b", "html", # Builder name. TODO: accept as arg to setup.py. 
    … …  
    369371                     os.path.join(SPHINX_BUILD, "html")]) 
    370372 
    371     print "=== Copy HTML Docs to Build Directory ===" 
     373    print("=== Copy HTML Docs to Build Directory ===") 
    372374    html = os.path.join(SPHINX_BUILD, "html") 
    373375    copy_tree(html, SASVIEW_DOCS) 
    … …  
    381383    build() 
    382384 
    383     print "=== Done ===" 
     385    print("=== Done ===") 
    384386 
    385387if __name__ == "__main__": 

  • docs/sphinx-docs/source/user/tutorial.rst

    r959eb01 r461a917  
    33.. _tutorial: 
    44 
    5 Tutorial 
    6 ======== 
     5Tutorials 
     6========= 
    77 
    88.. note:: In Windows use [Alt]-[Cursor left] to return to the previous page 
    99 
    10 :download:`Tutorial <../../../../sasview/media/Tutorial.pdf>` 
     10:download:`Getting Started with Sasview <../../../../sasview/media/getting_started_with_sasview.pdf>` 
     11 
     12:download:`Old Tutorial <../../../../sasview/media/Tutorial.pdf>` 

  • docs/sphinx-docs/source/user/working.rst

    r959eb01 r8cc39d6  
    1515   Test Data <../test/testdata_help.rst> 
    1616       
    17    Tutorial <tutorial.rst> 
     17   Tutorials <tutorial.rst> 
    1818    
    1919   Writing a Plugin Model <sasgui/perspectives/fitting/plugin.rst> 
Note: See TracChangeset for help on using the changeset viewer.