Merge branch 'master' into dev/AFG3152C

.gitignore

@@ -103,5 +103,9 @@ ENV/
 # PyPI
 .pypirc
 
+
+# VSCode
+settings.json
+
 # Vim
 *.swp

AUTHORS.txt

@@ -15,4 +15,6 @@ Joseph Mittelstaedt
 Troy Fox
 Vikram Sekar
 Casper Schippers
-Sumatran Tiger
+Sumatran Tiger
+Michael Schneider
+Dennis Feng

CHANGES.txt

@@ -1,3 +1,15 @@
+Version 0.7 -- release 8/4/19
+=============================
+- Dropped support for Python 3.4, adding support for Python 3.7
+- Significant improvements to CI, dependencies, and conda environment (@bilderbuchi, @cjermain)
+- Fix for PyQT issue in ResultsDialog (@CasperSchippers)
+- Fix for wire validator in Keithley 2400 (@Fattotora)
+- Addition of source_enabled control for Keithley 2400 (@dennisfeng2)
+- Time constant fix and input controls for SR830 (@dennisfeng2)
+- Added Keithley 2450 and Agilent 33521A (@hlgirard, @Endever42)
+- Proper escaping support in CSV headers (@feph)
+- Minor updates (@dvase)
+
 Version 0.6.1 -- release 4/21/19
 ================================
 - Added Elektronica SM70-45D, Agilent 33220A, and Keysight N5767A instruments

RELEASE.md

@@ -0,0 +1,40 @@
+# Release
+
+## PyMeasure package
+
+1. Pull the latest `master` branch
+2. `git checkout -b v<version>_release`
+3. Update all version references (`grep -rnI '<previous_version>'`)
+    - setup.py
+    - docs/conf.py
+    - pymeasure/__init__.py
+4. Update CHANGES.txt with the changelog
+5. Push the changes up as a PR
+6. Verify that the builds complete
+7. Merge the PR
+8. Build the source packages
+    - `python setup.py bdist_wheel`
+    - `pthon setup.py`
+9. Create a tagged release on GitHub
+
+## conda-forge feedstock
+
+1. Pull the latest `master` branch
+2. `git checkout -b v<version>_release`
+3. Download the tarball and determine the sha256 checksum
+    - `wget -qO- https://github.com/ralph-group/pymeasure/archive/<version>.tar.gz | sha256sum`
+4. Update recipe/meta.yml with the checksum and version number
+5. Push the changes up as a PR
+6. Verify that the builds complete
+7. Merge the PR
+
+## PyPI release
+
+1. Ensure twine is the latest version (`pip install -U twine`)
+2. Check the distributions (`twine check dist/*`)
+3. Upload the wheel and source distributions to the test server
+    - `twine upload --repository-url https://test.pypi.org/legacy/ dist/PyMeasure-<version>-py3-none-any.whl`
+    - `twine upload --repository-url https://test.pypi.org/legacy/ dist/PyMeasure-<version>.tar.gz`
+4. Verify the test repository: https://test.pypi.org/project/PyMeasure
+5. Upload to the real repository (`twine upload dist/PyMeasure-<version>*`)
+6. Verify that the package is updated: https://pypi.org/project/PyMeasure

appveyor.yml

@@ -61,6 +61,7 @@ install:
   #- "%PYTHON%\\python.exe -m pip install -r requirements/core.txt"
 
   - "set PATH=%MINICONDA%;%MINICONDA%\\Scripts;%PATH%"
+  - call %MINICONDA%\Scripts\activate.bat
   - conda config --set always_yes yes --set changeps1 no
   - conda update -q conda
   - conda info -a

docs/about/authors.rst

@@ -19,4 +19,5 @@ The following developers have contributed to the PyMeasure package:
 | Julian Dlugosch
 | Vikram Sekar
 | Casper Schippers
-| Sumatran Tiger
+| Sumatran Tiger
+| Dennis Feng

docs/api/instruments/agilent/agilent33500.rst

@@ -0,0 +1,7 @@
+##########################################################
+Agilent 33500 Function/Arbitrary Waveform Generator Family
+##########################################################
+
+.. autoclass:: pymeasure.instruments.agilent.Agilent33500
+    :members:
+    :show-inheritance:

docs/api/instruments/agilent/agilent33521A.rst

@@ -0,0 +1,7 @@
+####################################################
+Agilent 33521A Function/Arbitrary Waveform Generator
+####################################################
+
+.. autoclass:: pymeasure.instruments.agilent.Agilent33521A
+    :members:
+    :show-inheritance:

docs/api/instruments/agilent/index.rst

@@ -16,3 +16,5 @@ This section contains specific documentation on the Agilent instruments that are
    agilent34410A
    agilent4156
    agilent33220A
+   agilent33500
+   agilent33521A

docs/conf.py

@@ -63,9 +63,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.6.1'
+version = '0.7.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.6.1'
+release = '0.7.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.6.1'
+__version__ = '0.7.0'