From d845879b2303a2dc5acb96c5660a9efdad909dd5 Mon Sep 17 00:00:00 2001 From: Sam Schott Date: Mon, 20 May 2019 14:07:30 +0100 Subject: [PATCH] version 1.1.2 --- CHANGELOG.md | 3 ++- setup.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f015058..075be58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ -#### v1.1.2-dev (2019-05-20): +#### v1.1.2 (2019-05-20): _Changed:_ - Fixed a bug which caused `from keithleygui.config import CONF` to fail in Python 2.7. +- Fixed a critical error which would prevent IV sweeps from returning a dataset. #### v1.1.1 (2019-05-16): _Changed:_ diff --git a/setup.py b/setup.py index f769373..c261d5a 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='keithleygui', - version='1.1.2-dev', + version='1.1.2', description="", author='Sam Schott', author_email='ss2151@cam.ac.uk', @@ -23,7 +23,7 @@ ] }, install_requires=[ - 'keithley2600>=1.2.0', + 'keithley2600>=1.2.1', 'numpy', 'pyvisa', 'pyqtgraph_cx',