Changeset 1594

Timestamp:

Nov 6, 2014 12:05:39 AM (8 years ago)

Author:

jemian

Message:

try to resolve problem with the traits imports when building the docs

Location:

pvMail/trunk

Files:

• docs/source/conf.py (modified) (1 diff)
• docs/source/pvMail/pvMail.rst (modified) (1 diff)
• src/PvMail/__init__.py (modified) (1 diff)
• src/PvMail/traits_gui.py (modified) (4 diffs)

pvMail/trunk/docs/source/conf.py

@@ -45 +45 @@
             return Mock()
 
-MOCK_MODULES = [ 'pyepics', 'argparse', 'epics', 'traits', 'traitsui.api', ]
 MOCK_MODULES = PvMail.__install_requires__
+MOCK_MODULES.append('epics')
 
 for mod_name in MOCK_MODULES:

pvMail/trunk/docs/source/pvMail/pvMail.rst

@@ -14 +14 @@
     :show-inheritance:
 
-..
-   :mod:`traits_gui` Module
-   ------------------------
-   
-   .. automodule:: PvMail.traits_gui
-       :members:
-       :undoc-members:
-       :show-inheritance:
+:mod:`traits_gui` Module
+------------------------
 
+.. automodule:: PvMail.traits_gui
+    :members:
+    :undoc-members:
+    :show-inheritance:
+

pvMail/trunk/src/PvMail/__init__.py

@@ -23 +23 @@
    ]
 __keywords__ = ['EPICS', 'PV', 'email', 'monitor']
-__install_requires__ = ('pyepics', 'traits', 'traitsui', )
+__install_requires__ = ['pyepics', 'traits', 'traitsui', ]
 
 __project_name__ = "PvMail"

pvMail/trunk/src/PvMail/traits_gui.py

@@ -24 +24 @@
 import pvMail
 
-from traits.api import HasTraits, String, List, Bool, Generic
-from traitsui.api import Item, View, StatusItem, Action, Handler
+from traits import api as traitsapi
+from traitsui import api as traitsuiapi
 
 
@@ -31 +31 @@
 
 
-class ActionHandler(Handler):
+class ActionHandler(traitsuiapi.Handler):
     '''implements controls for PvMail GUI application'''
     
@@ -80 +80 @@
 
 
-class PvMail_GUI(HasTraits):
+class PvMail_GUI(traitsapi.HasTraits):
     '''
     GUI used for pvMail,
     declared using Enthought's Traits module
     '''
-    triggerPV = String(
+    triggerPV = traitsapi.String(
                  desc="EPICS PV name on which to trigger an email",
                  label="trigger PV",)
-    messagePV = String(
+    messagePV = traitsapi.String(
                  desc="EPICS string PV name with short message text",
                  label="message PV",)
-    recipients = List(
-                 trait=String,
+    recipients = traitsapi.List(
+                 trait=traitsapi.String,
                  value=["", "",],
                  desc="email addresses of message recipients",
                  label="email address(es)",)
-    actionRun = Action(name = "Run",
+    actionRun = traitsuiapi.Action(name = "Run",
                        desc = "start watching for trigger PV to go from 0 to 1",
                        action = "do_run")
-    actionStop = Action(name = "Stop",
+    actionStop = traitsuiapi.Action(name = "Stop",
                         desc = "stop watching trigger PV",
                         action = "do_stop")
 
-    status_label = String('status:')
-    status_msg = String
-    running = Bool(False)
-    pvm = Generic(None)
+    status_label = traitsapi.String('status:')
+    status_msg = traitsapi.String
+    running = traitsapi.Bool(False)
+    pvm = traitsapi.Generic(None)
     
-    view = View('triggerPV', 
+    view = traitsuiapi.View('triggerPV', 
                 'messagePV', 
                 'recipients', 
-                Item('running', style = 'readonly', label = 'Running?', ),
+                traitsuiapi.Item('running', style = 'readonly', label = 'Running?', ),
                 title="PvMail GUI",
                 width=500,
@@ -118 +118 @@
                 handler = ActionHandler(),
                 statusbar = [
-                   StatusItem(name = 'status_label', width = 80),
-                   StatusItem(name = 'status_msg', width = 0.5),
+                   traitsuiapi.StatusItem(name = 'status_label', width = 80),
+                   traitsuiapi.StatusItem(name = 'status_msg', width = 0.5),
                 ],
                 resizable=True)