Merge pull request #398 from pymeasure/v0.9_release

v0.9 release

CHANGES.txt

@@ -1,3 +1,29 @@
+Version 0.9 -- released 2/7/21
+==============================
+- PyMeasure is now officially at github.com/pymeasure/pymeasure
+- Python 3.9 is now supported, Python 3.5 removed due to EOL
+- Move to GitHub Actions from TravisCI and Appveyor for CI (@bilderbuchi)
+- New additions to Oxford Instruments ITC 503 (@CasperSchippers)
+- New Agilent 34450A and Keysight DSOX1102G instruments (@theMashUp, @jlarochelle)
+- Improvements to NI VirtualBench (@moritzj29)
+- New Agilent B1500 instrument (@moritzj29)
+- New Keithley 6517B instrument (@wehlgrundspitze)
+- Major improvements to PyVISA compatbility (@bilderbuchi, @msmttchr, @CasperSchippers, @cjermain)
+- New Anapico APSIN12G instrument (@StePhanino)
+- Improvements to Thorelabs Pro 8000 and SR830 (@Mike-HubGit)
+- New SR860 instrument (@StevenSiegl, @bklebel)
+- Fix to escape sequences (@tirkarthi)
+- New directory input for ManagedWindow (@paulgoulain)
+- New TelnetAdapter and Attocube ANC300 Piezo controller (@dkriegner)
+- New Agilent 34450A (@theMashUp)
+- New Razorbill RP100 strain cell controller (@pheowl)
+- Fixes to precision and default value of ScientificInput and FloatParameter (@moritzj29)
+- Fixes for Keithly 2400 and 2450 controls (@pyMatJ)
+- Improvments to Inputs and open_file_externally (@msmttchr)
+- Fixes to Agilent 8722ES (@alexmcnabb)
+- Fixes to QThread cleanup (@neal-kepler, @msmttchr)
+- Fixes to Keyboard interrupt, and parameters (@CasperSchippers)
+
 Version 0.8 -- released 3/29/19
 ===============================
 - Python 3.8 is now supported

docs/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.8.0'
+version = '0.9.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.8.0'
+release = '0.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

pymeasure/__init__.py

@@ -22,4 +22,4 @@
 # THE SOFTWARE.
 #
 
-__version__ = '0.8.0'
+__version__ = '0.9.0'

pymeasure/display/widgets.py

@@ -1034,5 +1034,5 @@ def __init__(self, parent=None):
 
     def browse_triggered(self):
         path = QtGui.QFileDialog.getExistingDirectory(self, 'Directory', '/')
-        if path is not '':
+        if path != '':
             self.setText(path)

pymeasure/experiment/experiment.py

@@ -39,6 +39,7 @@
 from .parameters import Measurable
 import time, signal
 import numpy as np
+import pandas as pd
 import tempfile
 import gc
 
@@ -181,6 +182,7 @@ def clear_plot(self):
         """Clear the figures and plot lists."""
         for fig in self.figs:
             fig.clf()
+        for pl in self.plots:
             pl.close()
         self.figs = []
         self.plots = []
@@ -202,7 +204,7 @@ def update_plot(self):
                         self.update_line(ax, line, x, yname)
                 if plot['type'] == 'pcolor':
                     x, y, z = plot['x'], plot['y'], plot['z']
-                    update_pcolor(ax, x, y, z)
+                    self.update_pcolor(ax, x, y, z)
 
             display.clear_output(wait=True)
             display.display(*self.figs)
@@ -221,6 +223,7 @@ def pcolor(self, xname, yname, zname, *args, **kwargs):
         diff = shape[0] * shape[1] - len(z)
         Z = np.concatenate((z.values, np.zeros(diff))).reshape(shape)
         df = pd.DataFrame(Z, index=y.unique(), columns=x.unique())
+        # TODO: Remove seaborn dependencies
         ax = sns.heatmap(df)
         pl.title(title)
         pl.xlabel(xname)
@@ -241,6 +244,7 @@ def update_pcolor(self, ax, xname, yname, zname):
         Z = np.concatenate((z.values, np.zeros(diff))).reshape(shape)
         df = pd.DataFrame(Z, index=y.unique(), columns=x.unique())
         cbar_ax = ax.get_figure().axes[1]
+        # TODO: Remove seaborn dependencies
         sns.heatmap(df, ax=ax, cbar_ax=cbar_ax)
         ax.set_xlabel(xname)
         ax.set_ylabel(yname)

pymeasure/instruments/ami/ami430.py

@@ -65,7 +65,7 @@ class AMI430(Instrument):
     """
     def __init__(self, resourceName, **kwargs):
         adapter = VISAAdapter(resourceName, read_termination='\n')
-        super(ami430, self).__init__(
+        super(AMI430, self).__init__(
             adapter,
             "AMI superconducting magnet power supply.",
             includeSCPI=True,

pymeasure/instruments/yokogawa/yokogawa7651.py

@@ -160,21 +160,21 @@ def disable_source(self):
         configuration of the instrument. """
         self.write("O0;E")
 
-    def apply_current(self, max_current=1e-3, complinance_voltage=1):
+    def apply_current(self, max_current=1e-3, compliance_voltage=1):
         """ Configures the instrument to apply a source current, which can
         take optional parameters that defer to the :attr:`~.Yokogawa7651.source_current_range`
         and :attr:`~.Yokogawa7651.compliance_voltage` properties. """
         self.source_mode = 'current'
         self.source_current_range = max_current
-        self.complinance_voltage = complinance_voltage
+        self.compliance_voltage = compliance_voltage
 
-    def apply_voltage(self, max_voltage=1, complinance_current=10e-3):
+    def apply_voltage(self, max_voltage=1, compliance_current=10e-3):
         """ Configures the instrument to apply a source voltage, which can
         take optional parameters that defer to the :attr:`~.Yokogawa7651.source_voltage_range`
         and :attr:`~.Yokogawa7651.compliance_current` properties. """
         self.source_mode = 'voltage'
         self.source_voltage_range = max_voltage
-        self.complinance_current = compliance_current
+        self.compliance_current = compliance_current
 
     def ramp_to_current(self, current, steps=25, duration=0.5):
         """ Ramps the current to a value in Amps by traversing a linear spacing

setup.py

@@ -27,12 +27,12 @@
 
 setup(
     name='PyMeasure',
-    version='0.8.0',
+    version='0.9.0',
     author='PyMeasure Developers',
     packages=find_packages(),
     scripts=[],
     url='https://github.com/pymeasure/pymeasure',
-    download_url='https://github.com/pymeasure/pymeasure/tarball/v0.8.0',
+    download_url='https://github.com/pymeasure/pymeasure/tarball/v0.9.0',
     license='MIT License',
     description='Scientific measurement library for instruments, experiments, and live-plotting',
     long_description=open('README.rst').read() + "\n\n" + open('CHANGES.txt').read(),