diff --git a/CHANGES b/CHANGES index 38fcbf7..1ed61e8 100644 --- a/CHANGES +++ b/CHANGES @@ -2,7 +2,13 @@ Lantz Changelog =============== -0.3 (unreleased) +0.4 (unreleased) +---------------- + +- Nothing changed yet. + + +0.3 (2015-02-05) ---------------- - Introduced MessageBasedDriver, a class to rule them all. diff --git a/MANIFEST.in b/MANIFEST.in index cdb4481..fae4715 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,10 +1,16 @@ include LICENSE AUTHORS README CHANGES -recursive-include tests * +recursive-include lantz/testsuite * recursive-include examples * recursive-include docs * recursive-include lantz/drivers * recursive-include lantz/simulators * recursive-include lantz/ui * + +include *.txt +include .travis.yml +recursive-include lantz *.c +recursive-include lantz *.h + global-exclude *.pyc *.pyo .DS_Store prune docs/_build prune docs/_themes/.git diff --git a/lantz/drivers/legacy/visa.py b/lantz/drivers/legacy/visa.py index d59cf74..6bcd75d 100644 --- a/lantz/drivers/legacy/visa.py +++ b/lantz/drivers/legacy/visa.py @@ -35,7 +35,10 @@ class VisaDriver(object): def __new__(cls, resource_name, *args, **kwargs): library_path = kwargs.get('library_path', None) - manager = visa.ResourceManager(library_path) + if library_path: + manager = visa.ResourceManager(library_path) + else: + manager = visa.ResourceManager() name = manager.resource_info(resource_name).resource_name if name.startswith('GPIB'): return GPIBVisaDriver(resource_name, *args, **kwargs) @@ -69,7 +72,10 @@ def __init__(self, resource_name, *args, **kwargs): self._init_attributes = {} library_path = kwargs.get('library_path', None) - self.resource_manager = visa.ResourceManager(library_path) + if library_path: + self.resource_manager = visa.ResourceManager(library_path) + else: + self.resource_manager = visa.ResourceManager() self.resource = None diff --git a/setup.py b/setup.py index f5daa5a..2091f50 100644 --- a/setup.py +++ b/setup.py @@ -47,7 +47,7 @@ def read(filename): setup(name='Lantz', - version='0.3.dev2', + version='0.4.dev0', license='BSD', description='Instrumentation framework', long_description=long_description, @@ -70,10 +70,6 @@ def read(filename): ] + requirements, zip_safe=False, platforms='any', - extra_require={'colorama': ['colorama'], - 'numpy': ['numpy'], - 'ui': ['sip', 'pyqt4'] - }, entry_points={ 'zest.releaser.releaser.after_checkout': [ 'pyroma = lantz:run_pyroma', diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 967b38f..0000000 --- a/tox.ini +++ /dev/null @@ -1,8 +0,0 @@ -[tox] -envlist = py32,py33 - -[testenv] -commands = {envpython} -m unittest discover -deps = - pint - stringparser