We're not going to try to support pyside 1 any more

physimals · Sep 9, 2021 · 0dd4c95 · 0dd4c95
1 parent aacbf05
commit 0dd4c95
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 164 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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