From c3d3d1eaaf38126cae5812361d6c38527b4502a4 Mon Sep 17 00:00:00 2001 From: Jan Petermann <jpeterma@physnet.uni-hamburg.de> Date: Mon, 29 Jul 2019 15:55:42 +0200 Subject: [PATCH] rename --- src/openqlab/io/importers/__init__.py | 28 +++++++++---------- src/openqlab/io/importers/ascii.py | 6 ++-- src/openqlab/io/importers/ascii_header.py | 6 ++-- .../io/importers/data_container_csv.py | 6 ++-- src/openqlab/io/importers/gwinstek.py | 6 ++-- src/openqlab/io/importers/gwinstek_lsf.py | 6 ++-- src/openqlab/io/importers/hp4395a.py | 6 ++-- src/openqlab/io/importers/hp4395a_gpib.py | 6 ++-- src/openqlab/io/importers/keysight_binary.py | 8 +++--- src/openqlab/io/importers/keysight_csv.py | 6 ++-- src/openqlab/io/importers/keysight_fra.py | 6 ++-- src/openqlab/plots/__init__.py | 2 +- 12 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/openqlab/io/importers/__init__.py b/src/openqlab/io/importers/__init__.py index 2908b44..c3ac800 100644 --- a/src/openqlab/io/importers/__init__.py +++ b/src/openqlab/io/importers/__init__.py @@ -3,19 +3,19 @@ import glob import importlib import inspect -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import BaseImporter -from OpenQlab.io.importers.ascii import ASCII -from OpenQlab.io.importers.data_container_csv import DataContainerCSV -from OpenQlab.io.importers.hp4395a import HP4395A -#from OpenQlab.io.importers.hp4395a_gpib import HP4395A_GPIB -from OpenQlab.io.importers.keysight_binary import KeysightBinary -from OpenQlab.io.importers.keysight_csv import KeysightCSV -from OpenQlab.io.importers.keysight_fra import KeysightFRA -from OpenQlab.io.importers.rhode_schwarz import RhodeSchwarz -from OpenQlab.io.importers.tektronix import Tektronix -from OpenQlab.io.importers.tektronix_dpx import TektronixDPX -from OpenQlab.io.importers.tektronix_spectrogram import TektronixSpectrogram +from openqlab.io.importers import utils +from openqlab.io.base_importer import BaseImporter +from openqlab.io.importers.ascii import ASCII +from openqlab.io.importers.data_container_csv import DataContainerCSV +from openqlab.io.importers.hp4395a import HP4395A +#from openqlab.io.importers.hp4395a_gpib import HP4395A_GPIB +from openqlab.io.importers.keysight_binary import KeysightBinary +from openqlab.io.importers.keysight_csv import KeysightCSV +from openqlab.io.importers.keysight_fra import KeysightFRA +from openqlab.io.importers.rhode_schwarz import RhodeSchwarz +from openqlab.io.importers.tektronix import Tektronix +from openqlab.io.importers.tektronix_dpx import TektronixDPX +from openqlab.io.importers.tektronix_spectrogram import TektronixSpectrogram @@ -29,7 +29,7 @@ for fn in glob.glob(IMPORTER_DIR + "/*.py"): if importer in ('__init__', 'utils'): continue try: - importer_module = importlib.import_module('OpenQlab.io.importers.' + importer, package='OpenQlab.io.importers') + importer_module = importlib.import_module('openqlab.io.importers.' + importer, package='openqlab.io.importers') for m in inspect.getmembers(importer_module, inspect.isclass): name, klass = m if issubclass(klass, BaseImporter): diff --git a/src/openqlab/io/importers/ascii.py b/src/openqlab/io/importers/ascii.py index 63a5994..eef51e0 100644 --- a/src/openqlab/io/importers/ascii.py +++ b/src/openqlab/io/importers/ascii.py @@ -1,8 +1,8 @@ from typing import List import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer class ASCII(StreamImporter): diff --git a/src/openqlab/io/importers/ascii_header.py b/src/openqlab/io/importers/ascii_header.py index a1585c0..cbc8717 100644 --- a/src/openqlab/io/importers/ascii_header.py +++ b/src/openqlab/io/importers/ascii_header.py @@ -1,8 +1,8 @@ from typing import List import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer import re from pathlib import Path diff --git a/src/openqlab/io/importers/data_container_csv.py b/src/openqlab/io/importers/data_container_csv.py index b220fc1..4b4f6f5 100644 --- a/src/openqlab/io/importers/data_container_csv.py +++ b/src/openqlab/io/importers/data_container_csv.py @@ -1,6 +1,6 @@ -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer -from OpenQlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer +from openqlab.io.importers import utils class DataContainerCSV(StreamImporter): diff --git a/src/openqlab/io/importers/gwinstek.py b/src/openqlab/io/importers/gwinstek.py index ee67cf5..c40dc6e 100644 --- a/src/openqlab/io/importers/gwinstek.py +++ b/src/openqlab/io/importers/gwinstek.py @@ -1,9 +1,9 @@ import numpy as np import pandas as pd -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer from typing import Callable, cast -from OpenQlab.io.importers import utils +from openqlab.io.importers import utils from pathlib import Path diff --git a/src/openqlab/io/importers/gwinstek_lsf.py b/src/openqlab/io/importers/gwinstek_lsf.py index 81d5929..1cc1e9e 100644 --- a/src/openqlab/io/importers/gwinstek_lsf.py +++ b/src/openqlab/io/importers/gwinstek_lsf.py @@ -1,9 +1,9 @@ import numpy as np import pandas as pd -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer from pandas.errors import EmptyDataError -from OpenQlab.io.importers import utils +from openqlab.io.importers import utils import struct diff --git a/src/openqlab/io/importers/hp4395a.py b/src/openqlab/io/importers/hp4395a.py index 1474a14..ba0bb93 100644 --- a/src/openqlab/io/importers/hp4395a.py +++ b/src/openqlab/io/importers/hp4395a.py @@ -1,9 +1,9 @@ from typing import List import pandas as pd from pandas.errors import EmptyDataError -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer from pathlib import Path diff --git a/src/openqlab/io/importers/hp4395a_gpib.py b/src/openqlab/io/importers/hp4395a_gpib.py index 2be7ace..7b3ef14 100644 --- a/src/openqlab/io/importers/hp4395a_gpib.py +++ b/src/openqlab/io/importers/hp4395a_gpib.py @@ -1,5 +1,5 @@ -from OpenQlab.io.base_importer import VisaImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.base_importer import VisaImporter +from openqlab.io.data_container import DataContainer import numpy as np import pandas as pd import serial @@ -77,7 +77,7 @@ class HP4395A_GPIB(VisaImporter): df.index.name = 'Frequency' header['xUnit'] = 'Hz' header['logX'] = True if gpib.command('SWPT?') == 'LOGF' else False - header['Channel'] = 1 if gpib.command('CHAN1?') == '1' else 2 + header['Channel'] = 1 if gpib.command('CHAN1?') == '1' else 2 output = DataContainer(df) output.update_header(header) return output diff --git a/src/openqlab/io/importers/keysight_binary.py b/src/openqlab/io/importers/keysight_binary.py index d1978f0..7977942 100644 --- a/src/openqlab/io/importers/keysight_binary.py +++ b/src/openqlab/io/importers/keysight_binary.py @@ -1,10 +1,10 @@ import struct import pandas as pd import numpy as np -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer -from OpenQlab.io.importers.OldImporters import agilent +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer +from openqlab.io.importers.OldImporters import agilent class KeysightBinary(StreamImporter): diff --git a/src/openqlab/io/importers/keysight_csv.py b/src/openqlab/io/importers/keysight_csv.py index 60a628b..399072e 100644 --- a/src/openqlab/io/importers/keysight_csv.py +++ b/src/openqlab/io/importers/keysight_csv.py @@ -1,7 +1,7 @@ import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer class KeysightCSV(StreamImporter): diff --git a/src/openqlab/io/importers/keysight_fra.py b/src/openqlab/io/importers/keysight_fra.py index 98518f2..196d546 100644 --- a/src/openqlab/io/importers/keysight_fra.py +++ b/src/openqlab/io/importers/keysight_fra.py @@ -1,8 +1,8 @@ from re import match import pandas as pd -from OpenQlab.io.importers import utils -from OpenQlab.io.base_importer import StreamImporter -from OpenQlab.io.data_container import DataContainer +from openqlab.io.importers import utils +from openqlab.io.base_importer import StreamImporter +from openqlab.io.data_container import DataContainer class KeysightFRA(StreamImporter): diff --git a/src/openqlab/plots/__init__.py b/src/openqlab/plots/__init__.py index 9c17793..516951e 100644 --- a/src/openqlab/plots/__init__.py +++ b/src/openqlab/plots/__init__.py @@ -7,5 +7,5 @@ import matplotlib as mpl # mpl.style.use(['seaborn-colorblind','seaborn-dark']) # if hasattr(mpl, 'style'): # mpl.style.use('seaborn-dark') - # mpl.style.use('OpenQlab') + # mpl.style.use('openqlab') # mpl.style.use('ggplot') -- GitLab