diff --git a/labscript/__init__.py b/labscript/__init__.py index 108772a..86d381f 100644 --- a/labscript/__init__.py +++ b/labscript/__init__.py @@ -10,33 +10,5 @@ # the project for the full license. # # # ##################################################################### -from __future__ import division, unicode_literals, print_function, absolute_import from labscript.labscript import * - -try: - from labscript_utils import check_version -except ImportError: - raise ImportError('Require labscript_utils > 2.1.0') - -check_version('labscript_utils', '2.2', '3') - - -# Initialisation, runs at import. Can be suppressed by setting -# labscript_auto_init = False in the locals of the importing scope -# before importing labscript. If you do this, you'll need to call -# labscript_init() yourself: - -#import inspect -#importing_frame = inspect.currentframe() -#importing_locals = importing_frame.f_back.f_locals -#if not 'labscript_auto_init' in importing_locals or importing_locals['labscript_auto_init']: -# overwrite = False -# if '-f' in sys.argv: -# overwrite = True -# sys.argv.remove('-f') -# if len(sys.argv) > 1: -# labscript_init(sys.argv[1],labscript_file=sys.argv[0]) -# elif sys.argv[0]: -# labscript_init(sys.argv[0].replace('.py','.h5'), labscript_file=sys.argv[0], new=True, overwrite=overwrite) - from .__version__ import __version__ diff --git a/labscript/functions.py b/labscript/functions.py index 32ca5f0..a78f632 100644 --- a/labscript/functions.py +++ b/labscript/functions.py @@ -11,7 +11,6 @@ # # ##################################################################### -from __future__ import division, unicode_literals, print_function, absolute_import from pylab import * import numpy as np diff --git a/labscript/labscript.py b/labscript/labscript.py index 2927ef5..2339633 100644 --- a/labscript/labscript.py +++ b/labscript/labscript.py @@ -11,13 +11,6 @@ # # ##################################################################### -from __future__ import division, unicode_literals, print_function, absolute_import -from labscript_utils import PY2 -if PY2: - str = unicode - import __builtin__ as builtins -else: - import builtins import os import sys import subprocess @@ -38,17 +31,13 @@ import labscript_utils.h5_lock, h5py import labscript_utils.properties -from labscript_utils import check_version - # This imports the default Qt library that other labscript suite code will # import as well, since it all uses qtutils. By having a Qt library already # imported, we ensure matplotlib (imported by pylab) will notice this and use # the same Qt library and API version, and therefore not conflict with any # other code is using: -check_version('qtutils', '2.0.0', '3.0.0') +import qtutils -# Required version for dedent() function -check_version('labscript_utils', '2.14.0', '3.0.0') from labscript_utils import dedent from labscript_utils.properties import set_attributes