Merge pull request #339 from ZLLentz/rel-2.0.0

REL: v2.0.0
pcdshub · Jun 28, 2019 · 6a16611 · 6a16611
2 parents f1d4a7f + 966d362
commit 6a16611
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -39,15 +39,15 @@ script:
   - flake8 pcdsdevices/*.py
   - flake8 tests/*.py
   - set -e
-  #Build docs
+  # Build docs
+  - conda install --file docs-requirements.txt
+  - pip install m2r
+  - pushd docs
+  - make html
+  - popd
+  # Upload docs
   - |
     if [[ -n "$DOCTR_DEPLOY_ENCRYPTION_KEY_PCDSHUB_PCDSDEVICES" && $BUILD_DOCS ]]; then
-      conda install --file docs-requirements.txt
-      pip install m2r
-      pushd docs
-      make html
-      popd
-      #Publish docs.
       doctr deploy . --built-docs docs/build/html --deploy-branch-name gh-pages
     fi
 

diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -4,6 +4,7 @@ Full API
 .. autosummary::
    :toctree: generated
 
+   ~pcdsdevices.analog_signals
    ~pcdsdevices.attenuator
    ~pcdsdevices.beam_stats
    ~pcdsdevices.ccm
@@ -22,8 +23,10 @@ Full API
    ~pcdsdevices.pseudopos
    ~pcdsdevices.pulsepicker
    ~pcdsdevices.pump
+   ~pcdsdevices.sequencer
    ~pcdsdevices.signal
    ~pcdsdevices.sim
    ~pcdsdevices.slits
    ~pcdsdevices.state
+   ~pcdsdevices.utils
    ~pcdsdevices.valve
diff --git a/docs/source/epics_types.rst b/docs/source/epics_types.rst
@@ -7,6 +7,7 @@ Common EPICS Devices
     :toctree: generated
 
     Attenuator
+    Acromag
     BeckhoffAxis
     CCM
     DelayNewport
@@ -19,8 +20,10 @@ Common EPICS Devices
     IonPump
     LODCM
     Motor
+    MovableStand
     Newport
     OffsetMirror
+    PCDSAreaDetector
     PIM
     PMC100
     PointingMirror

diff --git a/docs/source/releases.rst b/docs/source/releases.rst
@@ -1,6 +1,32 @@
 Release History
 ###############
 
+v2.0.0 (2019-06-28)
+=================
+
+Features
+--------
+- Add ``gauge`` and ``pump`` modules
+- Add ``Acromag`` and ``Mesh`` classes
+- Add ``motor`` subdevice to state record devices
+- Add ``status`` string to ``BeckhoffAxis``
+
+API Breaks
+----------
+- State devices no longer have the ``readback`` signal, as it is redundant
+  with the new ``motor`` subdevice
+- ``PCDSDetector`` has been renamed to ``PCDSAreaDetector`` for clarity.
+  ``PCDSDetectorBase`` is also renamed to ``PCDSAreaDetectorBase``.
+
+Bugfixes
+--------
+- Fix PVs in ``BeckhoffAxis``
+
+Misc
+----
+- Officially build for ``python=3.7``
+
+
 v1.2.0 (2019-03-08)
 ===================
 

diff --git a/docs/source/sim_types.rst b/docs/source/sim_types.rst
@@ -8,5 +8,6 @@ Simulated Devices
     :toctree: generated
 
     SynMotor
+    FastMotor
     SlowMotor 
     SimTwoAxis
diff --git a/pcdsdevices/device_types.py b/pcdsdevices/device_types.py
@@ -2,7 +2,7 @@
 from .attenuator import Attenuator
 from .analog_signals import Acromag
 from .ccm import CCM
-from .areadetector.detectors import PCDSDetector
+from .areadetector.detectors import PCDSAreaDetector
 from .epics_motor import (IMS, Newport, DelayNewport, PMC100, BeckhoffAxis,
                           EpicsMotor, Motor)
 from .evr import Trigger

diff --git a/pcdsdevices/epics_motor.py b/pcdsdevices/epics_motor.py
@@ -461,6 +461,10 @@ def Motor(prefix, **kwargs):
     +===============+=========================+
     | MMS           | :class:`.IMS`           |
     +---------------+-------------------------+
+    | CLZ           | :class:`.IMS`           |
+    +---------------+-------------------------+
+    | CLF           | :class:`.IMS`           |
+    +---------------+-------------------------+
     | MMN           | :class:`.Newport`       |
     +---------------+-------------------------+
     | MZM           | :class:`.PMC100`        |