#76 revert, for now

BCDA-APS · Dec 27, 2018 · b5037d7 · b5037d7
1 parent 9d27f49
commit b5037d7
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/APS_BlueSky_tools/devices.py b/APS_BlueSky_tools/devices.py
@@ -38,10 +38,6 @@
     ~EpicsMotorServoMixin
     ~EpicsMotorShutter
     ~EpicsOnOffShutter
-    ~EpicsMotorWithDescription
-    ~EpicsMotorWithMore
-    ~TunableEpicsMotor
-    ~TunableSynAxis
 
 SHUTTERS
 
@@ -682,8 +678,9 @@ def tune(self, md=None, **kwargs):
                 self.post_tune_method()
 
 
-class TunableSynAxis(AxisTunerMixin, SynAxis): """synthetic axis that can be tuned"""
-class TunableEpicsMotor(AxisTunerMixin, EpicsMotor): """EpicsMotor that can be tuned"""
+# TODO: issue #76
+# class TunableSynAxis(AxisTunerMixin, SynAxis): """synthetic axis that can be tuned"""
+# class TunableEpicsMotor(AxisTunerMixin, EpicsMotor): """EpicsMotor that can be tuned"""
 
 
 class EpicsDescriptionMixin(DeviceMixinBase):
@@ -808,21 +805,24 @@ class myEpicsMotor(EpicsMotorRawMixin, EpicsMotor): pass
     raw = Component(EpicsSignal, ".RRBV", write_pv=".RVAL")
 
 
-class EpicsMotorWithDescription(EpicsDescriptionMixin, EpicsMotor): """EpicsMotor with description field"""
-class EpicsMotorWithMore(
-    EpicsDescriptionMixin, 
-    EpicsMotorLimitsMixin, 
-    EpicsMotorDialMixin,
-    EpicsMotorRawMixin, 
-    EpicsMotor): 
-    """
-    EpicsMotor with more fields
-    
-    * description (``desc``)
-    * soft motor limits (``soft_limit_hi``, ``soft_limit_lo``)
-    * dial coordinates (``dial``)
-    * raw coordinates (``raw``)
-    """
+# TODO: issue #76
+# class EpicsMotorWithDescription(EpicsDescriptionMixin, EpicsMotor):
+#     """EpicsMotor with description field"""
+#
+# class EpicsMotorWithMore(
+#     EpicsDescriptionMixin, 
+#     EpicsMotorLimitsMixin, 
+#     EpicsMotorDialMixin,
+#     EpicsMotorRawMixin, 
+#     EpicsMotor): 
+#     """
+#     EpicsMotor with more fields
+#     
+#     * description (``desc``)
+#     * soft motor limits (``soft_limit_hi``, ``soft_limit_lo``)
+#     * dial coordinates (``dial``)
+#     * raw coordinates (``raw``)
+#     """
 
 
 class EpicsMotorShutter(Device):

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -171,4 +171,4 @@
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 # http://www.sphinx-doc.org/en/master/usage/extensions/autodoc.html#confval-autodoc_mock_imports
-autodoc_mock_imports = "h5py numpy matplotlib pandas".split()
+autodoc_mock_imports = "h5py numpy matplotlib pandas bluesky ophyd databroker pyRestTable".split()
diff --git a/environment.yml b/environment.yml
@@ -20,3 +20,4 @@ dependencies:
   - super-state-machine
   - versioneer
   - pyRestTable
+prefix: /home/mintadmin/Apps/BlueSky/envs/toolsdoc