Changeset c2ee2b1 in sasview

Timestamp:

Jun 16, 2015 9:48:51 AM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

c85b0ae, 66f21cd

Parents:

d70a31d

Message:

make sphinx rebuild work from 'python setup.py docs'

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (2 diffs)
• setup.py (modified) (1 diff)

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