Skip to content

Remove PY2 compat and calls to labscript_utils.check_version #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisjbillington merged 1 commit into from
May 24, 2020
Merged

Remove PY2 compat and calls to labscript_utils.check_version #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions labscript/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__
1 change: 0 additions & 1 deletion labscript/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# #
#####################################################################

from __future__ import division, unicode_literals, print_function, absolute_import
from pylab import *
import numpy as np

Expand Down
13 changes: 1 addition & 12 deletions labscript/labscript.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down