Changeset 0e9048f in sasmodels

Timestamp:

Nov 23, 2015 5:02:27 PM (9 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

cd3dba0, 34375ea

Parents:

23259b9

Message:

fix some of the doc build errors

Location:

sasmodels

Files:

• bumps_model.py (modified) (2 diffs)
• models/gaussian_peak.py (modified) (1 diff)
• models/teubner_strey.py (modified) (1 diff)

sasmodels/bumps_model.py

@@ -17 +17 @@
 import numpy as np
 
-from bumps.names import Parameter
-
 from . import sesans
 from . import weights
@@ -36 +34 @@
 class Model(object):
     def __init__(self, model, **kw):
+        # lazy import; this allows the doc builder and nosetests to run even
+        # when bumps is not on the path.
+        from bumps.names import Parameter
+
         self._sasmodel = model
         partype = model.info['partype']

sasmodels/models/gaussian_peak.py

@@ -22 +22 @@
 
 
-.. image:: img/gaussian_peak_1d.jpg
+.. figure:: img/gaussian_peak_1d.jpg
 
     1D plot using the default values (w/500 data points).

sasmodels/models/teubner_strey.py

@@ -36 +36 @@
 
 
-.. image:: img/teubner_strey_1d.jpg
+.. figure:: img/teubner_strey_1d.jpg
 
     1D plot using the default values (w/200 data point).