Skip to content

Commit

Permalink
Merge pull request #189 from ralph-group/bump_to_0.6.1
Browse files Browse the repository at this point in the history
Bump to 0.6.1
  • Loading branch information
cjermain committed Apr 21, 2019
2 parents aefb3fb + 09c91ff commit c2cf1ab
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
9 changes: 8 additions & 1 deletion CHANGES.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Version 0.6.1 -- release 4/21/19
================================
- Added Elektronica SM70-45D, Agilent 33220A, and Keysight N5767A instruments
(@CasperSchippers, @sumatrae)
- Fixes for Prologix adapter and Keithley 2400 (@hlgirard, @ronan-sensome)
- Improved support for SRS SR830 (@CasperSchippers)

Version 0.6 -- released 1/14/19
===============================
- New VXI11 Adapter for ethernet instruments (@chweiser)
Expand Down Expand Up @@ -139,4 +146,4 @@ Version 0.1.1 -- released 7/16/14

Version 0.1.0 -- released 7/15/14
=================================
- Initial release
- Initial release
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
# built documents.
#
# The short X.Y version.
version = '0.6.0'
version = '0.6.1'
# The full version, including alpha/beta/rc tags.
release = '0.6.0'
release = '0.6.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion pymeasure/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
# THE SOFTWARE.
#

__version__ = '0.6.0'
__version__ = '0.6.1'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@

setup(
name='PyMeasure',
version='0.6.0',
version='0.6.1',
author='PyMeasure Developers',
packages=find_packages(),
scripts=[],
url='https://github.com/ralph-group/pymeasure',
download_url='https://github.com/ralph-group/pymeasure/tarball/v0.6.0',
download_url='https://github.com/ralph-group/pymeasure/tarball/v0.6.1',
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(),
Expand Down

0 comments on commit c2cf1ab

Please sign in to comment.