Merge 31b3cd0 into 760deb3

doc/examples/ex_hp3456.py

@@ -4,7 +4,7 @@
 import logging
 import time
 import instruments as ik
-import instruments.units as u
+from instruments.units import ureg as u
 
 dmm = ik.hp.HP3456a.open_gpibusb('/dev/ttyUSB0', 22)
 logging.basicConfig(level=logging.DEBUG)

doc/examples/ex_maui.ipynb

@@ -38,7 +38,7 @@
     "\n",
     "# import the instrument kit\n",
     "import instruments as ik\n",
-    "import instruments.units as u\n",
+    "from instruments.units import ureg as u\n",
     "\n",
     "# imports for specific functions in this script\n",
     "import matplotlib.pyplot as plt\n",

doc/examples/ex_tekdpo70000.ipynb

@@ -152,7 +152,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "_.rescale('GHz')"
+      "_.to('GHz')"
      ],
      "language": "python",
      "metadata": {},

doc/examples/ex_topticatopmode.py

@@ -5,7 +5,7 @@
 """
 
 import instruments as ik
-import instruments.units as u
+from instruments.units import ureg as u
 from platform import system
 if system() == 'Windows':
       tm = ik.toptica.TopMode.open_serial('COM17', 115200)

doc/examples/minghe/ex_minghe_mhs5200.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python
 from instruments.minghe import MHS5200
-import instruments.units as u
+from instruments.units import ureg as u
 
 mhs = MHS5200.open_serial(vid=6790, pid=29987, baud=57600)
 print(mhs.serial_number)

doc/examples/qubitekk/ex_qubitekk_mc1.py

@@ -3,7 +3,7 @@
 from time import sleep
 
 from instruments.qubitekk import MC1
-import instruments.units as u
+from instruments.units import ureg as u
 
 
 if __name__ == "__main__":

doc/examples/srs_DG645.ipynb

@@ -43,7 +43,7 @@
      "collapsed": false,
      "input": [
       "from instruments.srs import SRSDG645\n",
-      "import instruments.units as u"
+      "from instruments.units import ureg as u"
      ],
      "language": "python",
      "metadata": {},

doc/examples/srs_DG645.py

@@ -21,7 +21,7 @@
 # <codecell>
 
 from instruments.srs import SRSDG645
-import instruments.units as u
+from instruments.units import ureg as u
 
 # <markdowncell>
 

doc/source/apiref/other.rst

@@ -29,11 +29,4 @@ Units
 -----
 
 Units are identified to the Phase Matrix FSW-0020 using the
-`~quantities.Quantity` class implemented by the `quantities` package. To support
-the FSW-0020, we provide several additional unit quantities, listed here.
-
-.. autodata:: mHz
-
-.. autodata:: dBm
-
-.. autodata:: cBm
+`~pint.Quantity` class implemented by the `pint` package.

doc/source/conf.py

@@ -248,7 +248,7 @@
     'http://docs.python.org/': None,
     'numpy': ('http://docs.scipy.org/doc/numpy', None),
     'serial': ('http://pyserial.sourceforge.net/', None),
-    'quantities': ('http://pythonhosted.org/quantities/', None),
+    'pint': ('https://pint.readthedocs.io/en/stable/', None),
 }
 
 autodoc_member_order = 'groupwise'

doc/source/devguide/code_style.rst

@@ -10,7 +10,7 @@ Data Types
 Numeric Data
 ------------
 
-When appropriate, use :class:`quantities.Quantity` objects to track units.
+When appropriate, use :class:`pint.Quantity` objects to track units.
 If this is not possible or appropriate, use a bare `float` for scalars
 and `np.ndarray` for array-valued data.
 

doc/source/devguide/util_fns.rst

@@ -75,12 +75,12 @@ These properties, when implemented in your class, might look like this::
         voltage = unitful_property(
         "VOLT",
         u.volt,
-        valid_range=(0*quantities.volt, 10*quantities.volt)
+        valid_range=(0*u.volt, 10*u.volt)
         doc="""
         Gets/sets the output voltage.
 
         :units: As specified, or assumed to be :math:`\\text{V}` otherwise.
-        :type: `float` or `~quantities.Quantity`
+        :type: `float` or `~pint.Quantity`
         """
     )
 
@@ -136,11 +136,11 @@ the `~instruments.thorlabs.TC200` class::
         doc="""
         Gets the actual temperature of the sensor
 
-        :units: As specified (if a `~quantities.quantity.Quantity`) or assumed
+        :units: As specified (if a `~pint.Quantity`) or assumed
             to be of units degrees C.
-        :type: `~quantities.quantity.Quantity` or `int`
+        :type: `~pint.Quantity` or `int`
         :return: the temperature (in degrees C)
-        :rtype: `~quantities.quantity.Quantity`
+        :rtype: `~pint.Quantity`
         """
     )
 

doc/source/intro.rst

@@ -29,7 +29,7 @@ $ pip install -r requirements.txt
 
 - NumPy
 - `PySerial`_
-- `quantities`_
+- `pint`_
 - `python-vxi11`_
 - `PyUSB`_ (version 1.0a or higher, required for raw USB support)
 - `python-usbtmc`_
@@ -40,7 +40,7 @@ Optional Dependencies
 ~~~~~~~~~~~~~~~~~~~~~
 
 .. _PySerial: http://pyserial.sourceforge.net/
-.. _quantities: http://pythonhosted.org/quantities/
+.. _pint: https://pint.readthedocs.io/en/stable/
 .. _ruamel.yaml: http://yaml.readthedocs.io
 .. _PyUSB: http://sourceforge.net/apps/trac/pyusb/
 .. _PyVISA: http://pyvisa.sourceforge.net/

instruments/__init__.py

@@ -6,6 +6,8 @@
 
 # IMPORTS ####################################################################
 
+__all__ = ["units"]
+
 
 from . import abstract_instruments
 from .abstract_instruments import Instrument
@@ -33,7 +35,8 @@
 from . import toptica
 from . import yokogawa
 
-from . import units
+from .units import ureg as units
+
 from .config import load_instruments
 
 # VERSION METADATA ###########################################################

instruments/abstract_instruments/comm/gpib_communicator.py

@@ -12,7 +12,7 @@
 import io
 import time
 
-import instruments.units as u
+from instruments.units import ureg as u
 
 from instruments.abstract_instruments.comm import AbstractCommunicator
 from instruments.util_fns import assume_units
@@ -98,7 +98,7 @@ def timeout(self):
         Gets/sets the timeeout of both the GPIB bus and the connection
         channel between the PC and the GPIB adapter.
 
-        :type: `~quantities.Quantity`
+        :type: `~pint.Quantity`
         :units: As specified, or assumed to be of units ``seconds``
         """
         return self._timeout
@@ -107,13 +107,13 @@ def timeout(self):
     def timeout(self, newval):
         newval = assume_units(newval, u.second)
         if self._model == GPIBCommunicator.Model.gi and self._version <= 4:
-            newval = newval.rescale(u.second)
+            newval = newval.to(u.second)
             self._file.sendcmd('+t:{}'.format(int(newval.magnitude)))
         else:
-            newval = newval.rescale(u.millisecond)
+            newval = newval.to(u.millisecond)
             self._file.sendcmd("++read_tmo_ms {}".format(int(newval.magnitude)))
-        self._file.timeout = newval.rescale(u.second)
-        self._timeout = newval.rescale(u.second)
+        self._file.timeout = newval.to(u.second)
+        self._timeout = newval.to(u.second)
 
     @property
     def terminator(self):

instruments/abstract_instruments/comm/serial_communicator.py

@@ -11,7 +11,7 @@
 import io
 import serial
 
-import instruments.units as u
+from instruments.units import ureg as u
 
 from instruments.abstract_instruments.comm import AbstractCommunicator
 from instruments.util_fns import assume_units
@@ -80,14 +80,14 @@ def timeout(self):
         """
         Gets/sets the communication timeout of the serial comm channel.
 
-        :type: `~quantities.Quantity`
+        :type: `~pint.Quantity`
         :units: As specified or assumed to be of units ``seconds``
         """
         return self._conn.timeout * u.second
 
     @timeout.setter
     def timeout(self, newval):
-        newval = assume_units(newval, u.second).rescale(u.second).magnitude
+        newval = assume_units(newval, u.second).to(u.second).magnitude
         self._conn.timeout = newval
 
     # FILE-LIKE METHODS #

instruments/abstract_instruments/comm/socket_communicator.py

@@ -11,7 +11,7 @@
 import io
 import socket
 
-import instruments.units as u
+from instruments.units import ureg as u
 
 from instruments.abstract_instruments.comm import AbstractCommunicator
 from instruments.util_fns import assume_units
@@ -70,14 +70,14 @@ def timeout(self):
         """
         Gets/sets the connection timeout of the socket comm channel.
 
-        :type: `~quantities.Quantity`
+        :type: `~pint.Quantity`
         :units: As specified or assumed to be of units ``seconds``
         """
         return self._conn.gettimeout() * u.second
 
     @timeout.setter
     def timeout(self, newval):
-        newval = assume_units(newval, u.second).rescale(u.second).magnitude
+        newval = assume_units(newval, u.second).to(u.second).magnitude
         self._conn.settimeout(newval)
 
     # FILE-LIKE METHODS #

instruments/abstract_instruments/comm/usbtmc_communicator.py

@@ -14,7 +14,7 @@
 
 from instruments.abstract_instruments.comm import AbstractCommunicator
 from instruments.util_fns import assume_units
-import instruments.units as u
+from instruments.units import ureg as u
 
 # CLASSES #####################################################################
 
@@ -67,14 +67,14 @@ def timeout(self):
         """
         Gets/sets the communication timeout of the usbtmc comm channel.
 
-        :type: `~quantities.Quantity`
+        :type: `~pint.Quantity`
         :units: As specified or assumed to be of units ``seconds``
         """
         return self._filelike.timeout * u.second
 
     @timeout.setter
     def timeout(self, newval):
-        newval = assume_units(newval, u.second).rescale(u.s).magnitude
+        newval = assume_units(newval, u.second).to(u.s).magnitude
         self._filelike.timeout = newval
 
     # FILE-LIKE METHODS #

instruments/abstract_instruments/comm/visa_communicator.py

@@ -14,7 +14,7 @@
 
 from instruments.abstract_instruments.comm import AbstractCommunicator
 from instruments.util_fns import assume_units
-import instruments.units as u
+from instruments.units import ureg as u
 
 # CLASSES #####################################################################
 
@@ -86,7 +86,7 @@ def timeout(self):
 
     @timeout.setter
     def timeout(self, newval):
-        newval = assume_units(newval, u.second).rescale(u.second).magnitude
+        newval = assume_units(newval, u.second).to(u.second).magnitude
         self._conn.timeout = newval
 
     # FILE-LIKE METHODS #

instruments/abstract_instruments/comm/vxi11_communicator.py

@@ -89,7 +89,7 @@ def timeout(self):
         """
         Gets/sets the communication timeout of the vxi11 comm channel.
 
-        :type: `~quantities.Quantity`
+        :type: `~pint.Quantity`
         :units: As specified or assumed to be of units ``seconds``
         """
         return self._inst.timeout

instruments/abstract_instruments/electrometer.py

@@ -47,7 +47,7 @@ def unit(self):
         Gets/sets the measurement mode for the electrometer. This is an
         abstract method.
 
-        :type: `~quantities.UnitQuantity`
+        :type: `~pint.Unit`
         """
 
     @property