Changeset 20eeb00 in sasview

Timestamp:

Jun 16, 2015 10:24:33 AM (9 years ago)

Author:

smk78

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

ff50c51

Parents:

d8ff88e (diff), c2ee2b1 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (2 diffs)
• setup.py (modified) (1 diff)
• sasview/media/README.txt (added)
• sasview/test/1d_data/AOT_Microemulsion-Core_Contrast.xml (added)
• sasview/test/1d_data/AOT_Microemulsion-Drop_Contrast.xml (added)
• sasview/test/1d_data/AOT_Microemulsion-Shell_Contrast.xml (added)
• sasview/test/1d_data/ISIS_Polymer_Blend_TK49.xml (added)
• sasview/test/1d_data/P123_D2O_10_percent.xml (added)
• sasview/test/1d_data/P123_D2O_30_percent.xml (added)
• sasview/test/1d_data/P123_D2O_40_percent.xml (added)
• sasview/test/1d_data/hSDS_D2O_0p5_percent.xml (added)
• sasview/test/1d_data/hSDS_D2O_2p0_percent.xml (added)
• sasview/test/1d_data/hSDS_D2O_2p0_percent_0p2M_NaCl.xml (added)

docs/sphinx-docs/build_sphinx.py

@@ -138 +138 @@
     copy_tree(html, SASVIEW_DOCS)
 
-if __name__ == "__main__":
+def rebuild():
     clean()
     retrieve_user_docs()
@@ -144 +144 @@
     apidoc()
     build()
-        
+
     print "=== Done ==="
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -158 +158 @@
         sys.path.append("docs/sphinx-docs")
         import build_sphinx
-
-        build_sphinx.clean()
-        build_sphinx.retrieve_user_docs()
-        build_sphinx.apidoc()
-        build_sphinx.build()
+        build_sphinx.rebuild()
 
 # sas module