From 0dd4c959cb246133d38afd753bb2972ac9316282 Mon Sep 17 00:00:00 2001 From: Martin Craig Date: Thu, 9 Sep 2021 12:14:35 +0100 Subject: [PATCH] We're not going to try to support pyside 1 any more --- quantiphyse/data/qpdata.py | 5 +---- quantiphyse/data/volume_management.py | 5 +---- quantiphyse/gui/dialogs.py | 5 +---- quantiphyse/gui/main_window.py | 5 +---- quantiphyse/gui/options.py | 5 +---- quantiphyse/gui/plot.py | 6 ++---- quantiphyse/gui/register.py | 5 +---- quantiphyse/gui/viewer/navigators.py | 5 +---- quantiphyse/gui/viewer/pickers.py | 5 +---- quantiphyse/gui/viewer/slice_viewer.py | 5 +---- quantiphyse/gui/viewer/view_options_dialog.py | 5 +---- quantiphyse/gui/viewer/view_params_widget.py | 5 +---- quantiphyse/gui/viewer/viewer.py | 5 +---- quantiphyse/gui/widgets.py | 5 +---- quantiphyse/packages/core/aif/widget.py | 5 +---- quantiphyse/packages/core/analysis/processes.py | 5 +---- quantiphyse/packages/core/analysis/tests.py | 5 +---- quantiphyse/packages/core/analysis/widgets.py | 5 +---- quantiphyse/packages/core/batch_builder/widget.py | 5 +---- quantiphyse/packages/core/clustering/widgets.py | 5 +---- quantiphyse/packages/core/compare/widget.py | 5 +---- quantiphyse/packages/core/data/widgets.py | 5 +---- quantiphyse/packages/core/experimental/__init__.py | 5 +---- quantiphyse/packages/core/histogram/widget.py | 5 +---- quantiphyse/packages/core/overview/widget.py | 5 +---- quantiphyse/packages/core/pca/widget.py | 5 +---- quantiphyse/packages/core/radialprofile/process.py | 5 +---- quantiphyse/packages/core/radialprofile/widget.py | 5 +---- quantiphyse/packages/core/registration/reg_method.py | 5 +---- quantiphyse/packages/core/registration/widget.py | 5 +---- quantiphyse/packages/core/roi_builder/tools.py | 5 +---- quantiphyse/packages/core/roi_builder/widget.py | 5 +---- quantiphyse/packages/core/simulation/widgets.py | 5 +---- quantiphyse/packages/core/smoothing/widget.py | 5 +---- quantiphyse/processes/process.py | 5 +---- quantiphyse/resources/resource_py2.py | 5 +---- quantiphyse/resources/resource_py3.py | 5 +---- quantiphyse/test/process_test.py | 5 +---- quantiphyse/test/widget_test.py | 5 +---- quantiphyse/utils/__init__.py | 5 +---- quantiphyse/utils/batch.py | 5 +---- 41 files changed, 42 insertions(+), 164 deletions(-) diff --git a/quantiphyse/data/qpdata.py b/quantiphyse/data/qpdata.py index 3789cdf4..47635f33 100644 --- a/quantiphyse/data/qpdata.py +++ b/quantiphyse/data/qpdata.py @@ -35,10 +35,7 @@ import numpy as np import scipy -try: - from PySide import QtCore -except ImportError: - from PySide2 import QtCore +from PySide2 import QtCore from quantiphyse.utils import sf, QpException from quantiphyse.utils.enums import Visibility, Boundary diff --git a/quantiphyse/data/volume_management.py b/quantiphyse/data/volume_management.py index 3c8f8b1c..b30f6f88 100644 --- a/quantiphyse/data/volume_management.py +++ b/quantiphyse/data/volume_management.py @@ -23,10 +23,7 @@ import re from collections import OrderedDict -try: - from PySide import QtCore -except ImportError: - from PySide2 import QtCore +from PySide2 import QtCore import numpy as np diff --git a/quantiphyse/gui/dialogs.py b/quantiphyse/gui/dialogs.py index 558a9f0e..68f8d586 100644 --- a/quantiphyse/gui/dialogs.py +++ b/quantiphyse/gui/dialogs.py @@ -18,10 +18,7 @@ import os -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets MAINWIN = None diff --git a/quantiphyse/gui/main_window.py b/quantiphyse/gui/main_window.py index 5e0f4238..8e5acee0 100644 --- a/quantiphyse/gui/main_window.py +++ b/quantiphyse/gui/main_window.py @@ -22,10 +22,7 @@ import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import pyqtgraph.console diff --git a/quantiphyse/gui/options.py b/quantiphyse/gui/options.py index a0d557bb..1aff3b44 100644 --- a/quantiphyse/gui/options.py +++ b/quantiphyse/gui/options.py @@ -35,10 +35,7 @@ import six import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data.extras import NumberListExtra from quantiphyse.utils import QpException, sf, load_matrix, local_file_from_drop_url, default_save_dir, set_default_save_dir diff --git a/quantiphyse/gui/plot.py b/quantiphyse/gui/plot.py index a0e8c15f..1853a288 100644 --- a/quantiphyse/gui/plot.py +++ b/quantiphyse/gui/plot.py @@ -20,10 +20,8 @@ import numpy as np import pyqtgraph as pg -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets + +from PySide2 import QtGui, QtCore, QtWidgets from scipy.interpolate import UnivariateSpline diff --git a/quantiphyse/gui/register.py b/quantiphyse/gui/register.py index 472e0961..48353664 100644 --- a/quantiphyse/gui/register.py +++ b/quantiphyse/gui/register.py @@ -22,10 +22,7 @@ import traceback import warnings -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import quantiphyse.gui.dialogs from quantiphyse.utils import get_icon, get_version diff --git a/quantiphyse/gui/viewer/navigators.py b/quantiphyse/gui/viewer/navigators.py index 497916bc..b5c80fa0 100644 --- a/quantiphyse/gui/viewer/navigators.py +++ b/quantiphyse/gui/viewer/navigators.py @@ -18,10 +18,7 @@ from __future__ import division, unicode_literals, absolute_import -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.utils import LogSource from quantiphyse.gui.widgets import OptionsButton diff --git a/quantiphyse/gui/viewer/pickers.py b/quantiphyse/gui/viewer/pickers.py index 15c1fccd..d9640e09 100644 --- a/quantiphyse/gui/viewer/pickers.py +++ b/quantiphyse/gui/viewer/pickers.py @@ -47,10 +47,7 @@ from __future__ import division, unicode_literals, absolute_import, print_function -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import numpy as np import pyqtgraph as pg diff --git a/quantiphyse/gui/viewer/slice_viewer.py b/quantiphyse/gui/viewer/slice_viewer.py index 135c6e88..a60c4592 100644 --- a/quantiphyse/gui/viewer/slice_viewer.py +++ b/quantiphyse/gui/viewer/slice_viewer.py @@ -18,10 +18,7 @@ from __future__ import division, unicode_literals, absolute_import -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import numpy as np import pyqtgraph as pg diff --git a/quantiphyse/gui/viewer/view_options_dialog.py b/quantiphyse/gui/viewer/view_options_dialog.py index dc2691ea..80503916 100644 --- a/quantiphyse/gui/viewer/view_options_dialog.py +++ b/quantiphyse/gui/viewer/view_options_dialog.py @@ -18,10 +18,7 @@ from __future__ import division, unicode_literals, print_function, absolute_import -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.utils.enums import Orientation, DisplayOrder, Visibility from quantiphyse.gui.options import OptionBox, ChoiceOption diff --git a/quantiphyse/gui/viewer/view_params_widget.py b/quantiphyse/gui/viewer/view_params_widget.py index 6a7c991d..f8ecd698 100644 --- a/quantiphyse/gui/viewer/view_params_widget.py +++ b/quantiphyse/gui/viewer/view_params_widget.py @@ -23,10 +23,7 @@ import logging -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.utils import get_icon, sf from quantiphyse.utils.enums import Visibility diff --git a/quantiphyse/gui/viewer/viewer.py b/quantiphyse/gui/viewer/viewer.py index ff579c07..2c63f751 100644 --- a/quantiphyse/gui/viewer/viewer.py +++ b/quantiphyse/gui/viewer/viewer.py @@ -18,10 +18,7 @@ from __future__ import division, unicode_literals, absolute_import -try: - from PySide import QtGui, QtCore -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import numpy as np diff --git a/quantiphyse/gui/widgets.py b/quantiphyse/gui/widgets.py index 31751dcd..7af0503d 100644 --- a/quantiphyse/gui/widgets.py +++ b/quantiphyse/gui/widgets.py @@ -20,10 +20,7 @@ import inspect import traceback -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.processes import Process from quantiphyse.utils import get_icon, load_matrix, local_file_from_drop_url, QpException, show_help, sf, LogSource diff --git a/quantiphyse/packages/core/aif/widget.py b/quantiphyse/packages/core/aif/widget.py index 84bb099c..d1d4539c 100644 --- a/quantiphyse/packages/core/aif/widget.py +++ b/quantiphyse/packages/core/aif/widget.py @@ -15,10 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import numpy as np diff --git a/quantiphyse/packages/core/analysis/processes.py b/quantiphyse/packages/core/analysis/processes.py index 5e69416d..1dc961fb 100644 --- a/quantiphyse/packages/core/analysis/processes.py +++ b/quantiphyse/packages/core/analysis/processes.py @@ -21,10 +21,7 @@ import numpy as np import scipy -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import NumpyData, OrthoSlice from quantiphyse.utils import QpException, table_to_extra, sf diff --git a/quantiphyse/packages/core/analysis/tests.py b/quantiphyse/packages/core/analysis/tests.py index 057236fe..ceafeba8 100644 --- a/quantiphyse/packages/core/analysis/tests.py +++ b/quantiphyse/packages/core/analysis/tests.py @@ -3,10 +3,7 @@ import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import DataGrid from quantiphyse.test.widget_test import WidgetTest diff --git a/quantiphyse/packages/core/analysis/widgets.py b/quantiphyse/packages/core/analysis/widgets.py index a22f49e1..3f8f2fa9 100644 --- a/quantiphyse/packages/core/analysis/widgets.py +++ b/quantiphyse/packages/core/analysis/widgets.py @@ -21,10 +21,7 @@ import math import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.plot import Plot from quantiphyse.gui.viewer.pickers import PickMode diff --git a/quantiphyse/packages/core/batch_builder/widget.py b/quantiphyse/packages/core/batch_builder/widget.py index 45a9611e..b75a8022 100644 --- a/quantiphyse/packages/core/batch_builder/widget.py +++ b/quantiphyse/packages/core/batch_builder/widget.py @@ -18,10 +18,7 @@ import os -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, TitleWidget, RunBox from quantiphyse.utils.batch import BatchScript diff --git a/quantiphyse/packages/core/clustering/widgets.py b/quantiphyse/packages/core/clustering/widgets.py index 6ce61781..a41cc703 100644 --- a/quantiphyse/packages/core/clustering/widgets.py +++ b/quantiphyse/packages/core/clustering/widgets.py @@ -22,10 +22,7 @@ from sklearn.metrics import pairwise import pyqtgraph as pg -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import NumpyData from quantiphyse.gui.widgets import QpWidget, OverlayCombo, RoiCombo, NumericOption, TitleWidget diff --git a/quantiphyse/packages/core/compare/widget.py b/quantiphyse/packages/core/compare/widget.py index 08da7594..c64c888e 100644 --- a/quantiphyse/packages/core/compare/widget.py +++ b/quantiphyse/packages/core/compare/widget.py @@ -16,10 +16,7 @@ limitations under the License. """ -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import pyqtgraph as pg import numpy as np diff --git a/quantiphyse/packages/core/data/widgets.py b/quantiphyse/packages/core/data/widgets.py index d5fba84c..528bf187 100644 --- a/quantiphyse/packages/core/data/widgets.py +++ b/quantiphyse/packages/core/data/widgets.py @@ -20,10 +20,7 @@ import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, TitleWidget, NumberGrid from quantiphyse.gui.options import OptionBox, DataOption, ChoiceOption, OutputNameOption, RunButton, NumericOption, NumberListOption, BoolOption diff --git a/quantiphyse/packages/core/experimental/__init__.py b/quantiphyse/packages/core/experimental/__init__.py index e5c4b778..054a6139 100644 --- a/quantiphyse/packages/core/experimental/__init__.py +++ b/quantiphyse/packages/core/experimental/__init__.py @@ -18,10 +18,7 @@ from __future__ import print_function, division -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, HelpButton diff --git a/quantiphyse/packages/core/histogram/widget.py b/quantiphyse/packages/core/histogram/widget.py index b5ab16b4..e15d297f 100644 --- a/quantiphyse/packages/core/histogram/widget.py +++ b/quantiphyse/packages/core/histogram/widget.py @@ -3,10 +3,7 @@ Copyright (c) 2013-2018 University of Oxford """ -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, TitleWidget from quantiphyse.gui.plot import Plot diff --git a/quantiphyse/packages/core/overview/widget.py b/quantiphyse/packages/core/overview/widget.py index 698ec774..993681b6 100644 --- a/quantiphyse/packages/core/overview/widget.py +++ b/quantiphyse/packages/core/overview/widget.py @@ -21,10 +21,7 @@ import os import logging -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import save, load from quantiphyse.gui.widgets import QpWidget, HelpButton, TextViewerDialog diff --git a/quantiphyse/packages/core/pca/widget.py b/quantiphyse/packages/core/pca/widget.py index 8f5b48bd..9d12ac7c 100644 --- a/quantiphyse/packages/core/pca/widget.py +++ b/quantiphyse/packages/core/pca/widget.py @@ -16,10 +16,7 @@ limitations under the License. """ import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, TitleWidget, RunWidget from quantiphyse.gui.options import OptionBox, DataOption, NumericOption, OutputNameOption diff --git a/quantiphyse/packages/core/radialprofile/process.py b/quantiphyse/packages/core/radialprofile/process.py index 5b81c831..921eee0a 100644 --- a/quantiphyse/packages/core/radialprofile/process.py +++ b/quantiphyse/packages/core/radialprofile/process.py @@ -19,10 +19,7 @@ import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.utils import QpException, table_to_extra from quantiphyse.processes import Process diff --git a/quantiphyse/packages/core/radialprofile/widget.py b/quantiphyse/packages/core/radialprofile/widget.py index a4573fae..611c782d 100644 --- a/quantiphyse/packages/core/radialprofile/widget.py +++ b/quantiphyse/packages/core/radialprofile/widget.py @@ -19,10 +19,7 @@ import six -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, TitleWidget from quantiphyse.gui.plot import Plot diff --git a/quantiphyse/packages/core/registration/reg_method.py b/quantiphyse/packages/core/registration/reg_method.py index b9f7f21c..a58c670b 100644 --- a/quantiphyse/packages/core/registration/reg_method.py +++ b/quantiphyse/packages/core/registration/reg_method.py @@ -15,10 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets import numpy as np diff --git a/quantiphyse/packages/core/registration/widget.py b/quantiphyse/packages/core/registration/widget.py index 100180d9..a777cf47 100644 --- a/quantiphyse/packages/core/registration/widget.py +++ b/quantiphyse/packages/core/registration/widget.py @@ -17,10 +17,7 @@ """ import traceback -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import QpData from quantiphyse.gui.widgets import QpWidget, RunWidget, TitleWidget, RunButton diff --git a/quantiphyse/packages/core/roi_builder/tools.py b/quantiphyse/packages/core/roi_builder/tools.py index 24cdc9e6..a78e3908 100644 --- a/quantiphyse/packages/core/roi_builder/tools.py +++ b/quantiphyse/packages/core/roi_builder/tools.py @@ -22,10 +22,7 @@ import skimage.segmentation import scipy.ndimage -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import NumpyData from quantiphyse.gui.widgets import OverlayCombo, RoiCombo, NumericOption, NumericSlider diff --git a/quantiphyse/packages/core/roi_builder/widget.py b/quantiphyse/packages/core/roi_builder/widget.py index e7be0313..97aacf3b 100644 --- a/quantiphyse/packages/core/roi_builder/widget.py +++ b/quantiphyse/packages/core/roi_builder/widget.py @@ -24,10 +24,7 @@ import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import NumpyData from quantiphyse.gui.options import OptionBox, DataOption, NumericOption, TextOption diff --git a/quantiphyse/packages/core/simulation/widgets.py b/quantiphyse/packages/core/simulation/widgets.py index d55ed69e..b9550cfe 100644 --- a/quantiphyse/packages/core/simulation/widgets.py +++ b/quantiphyse/packages/core/simulation/widgets.py @@ -15,10 +15,7 @@ See the License for the specific language governing permissions and limitations under the License. """ -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.options import OptionBox, NumericOption, DataOption, OutputNameOption, ChoiceOption from quantiphyse.gui.widgets import QpWidget, TitleWidget diff --git a/quantiphyse/packages/core/smoothing/widget.py b/quantiphyse/packages/core/smoothing/widget.py index 9cf102be..68f12f7e 100644 --- a/quantiphyse/packages/core/smoothing/widget.py +++ b/quantiphyse/packages/core/smoothing/widget.py @@ -16,10 +16,7 @@ limitations under the License. """ -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.gui.widgets import QpWidget, TitleWidget, OverlayCombo, NumericOption from quantiphyse.utils import QpException diff --git a/quantiphyse/processes/process.py b/quantiphyse/processes/process.py index 1ba23684..62031feb 100644 --- a/quantiphyse/processes/process.py +++ b/quantiphyse/processes/process.py @@ -22,10 +22,7 @@ from six.moves import queue as singleproc_queue import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import NumpyData, save from quantiphyse.utils import LogSource, QpException, get_plugins, set_local_file_path diff --git a/quantiphyse/resources/resource_py2.py b/quantiphyse/resources/resource_py2.py index 2c98949d..1a4b207e 100644 --- a/quantiphyse/resources/resource_py2.py +++ b/quantiphyse/resources/resource_py2.py @@ -7,10 +7,7 @@ # # WARNING! All changes made in this file will be lost! -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets qt_resource_data = "\ \x00\x00\x00\xb7\ diff --git a/quantiphyse/resources/resource_py3.py b/quantiphyse/resources/resource_py3.py index 07734189..5a604fad 100644 --- a/quantiphyse/resources/resource_py3.py +++ b/quantiphyse/resources/resource_py3.py @@ -7,10 +7,7 @@ # # WARNING! All changes made in this file will be lost! -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets qt_resource_data = b"\ \x00\x00\x01B\ diff --git a/quantiphyse/test/process_test.py b/quantiphyse/test/process_test.py index 7e62ee04..cb71bb9f 100644 --- a/quantiphyse/test/process_test.py +++ b/quantiphyse/test/process_test.py @@ -29,10 +29,7 @@ import scipy import nibabel as nib -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import DataGrid, ImageVolumeManagement from quantiphyse.processes import Process diff --git a/quantiphyse/test/widget_test.py b/quantiphyse/test/widget_test.py index 5ae0e8e1..c2acaa06 100644 --- a/quantiphyse/test/widget_test.py +++ b/quantiphyse/test/widget_test.py @@ -12,10 +12,7 @@ import numpy as np import scipy -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data import DataGrid, ImageVolumeManagement from quantiphyse.gui.viewer.viewer import Viewer diff --git a/quantiphyse/utils/__init__.py b/quantiphyse/utils/__init__.py index 870ca747..e1dbd28d 100644 --- a/quantiphyse/utils/__init__.py +++ b/quantiphyse/utils/__init__.py @@ -26,10 +26,7 @@ import numpy as np import pandas as pd -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.data.extras import DataFrameExtra from .exceptions import QpException diff --git a/quantiphyse/utils/batch.py b/quantiphyse/utils/batch.py index 9ff57a8a..1a0ce477 100644 --- a/quantiphyse/utils/batch.py +++ b/quantiphyse/utils/batch.py @@ -40,10 +40,7 @@ import yaml import numpy as np -try: - from PySide import QtGui, QtCore, QtGui as QtWidgets -except ImportError: - from PySide2 import QtGui, QtCore, QtWidgets +from PySide2 import QtGui, QtCore, QtWidgets from quantiphyse.processes import Process from quantiphyse.processes.io import *