diff --git a/Framework/PythonInterface/mantid/plots/utility.py b/Framework/PythonInterface/mantid/plots/utility.py index 0e8af988ca772c85b97278b2ae7b7acc84186dc1..6b42a239e0c162a62a8e8c1ab7f5c83da73ea161 100644 --- a/Framework/PythonInterface/mantid/plots/utility.py +++ b/Framework/PythonInterface/mantid/plots/utility.py @@ -12,7 +12,7 @@ from contextlib import contextmanager from matplotlib import cm from matplotlib.container import ErrorbarContainer -from mantid.py3compat import Enum +from enum import Enum # Any changes here must be reflected in the definition in diff --git a/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec b/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec index f5a9a55f41cf8dafd6a59dbe1078dd457350883f..1dea7f388369cdfc1711a3fa6d85137fa25b273b 100644 --- a/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec +++ b/buildconfig/dev-packages/rpm/mantid-developer/mantid-developer.spec @@ -5,7 +5,7 @@ %endif Name: mantid-developer -Version: 1.34 +Version: 1.35 Release: 1%{?dist} Summary: Meta Package to install dependencies for Mantid Development @@ -57,6 +57,7 @@ Requires: python2-sphinx-bootstrap-theme Requires: PyYAML Requires: python2-mock Requires: python2-psutil +Requires: python-enum34 Requires: qscintilla-devel Requires: qt-devel >= 4.6 Requires: qwt5-qt4-devel @@ -146,6 +147,9 @@ required for Mantid development. %changelog +* Tue Dec 03 2019 David Fairbrother <david.fairbrother@stfc.ac.uk> +- Added Python Enum34 back-port to the required Python dependencies + * Tue Nov 5 2019 Martyn Gigg <martyn.gigg@stfc.ac.uk> - Switch to python{2,3}-qt5-devel - Remove python2-scikit-image diff --git a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py index d7f654434dd36913ccf428638249d28440ed9d43..8170cad21f3b96586e54f5efb4c477b5a86342d2 100644 --- a/qt/applications/workbench/workbench/plotting/globalfiguremanager.py +++ b/qt/applications/workbench/workbench/plotting/globalfiguremanager.py @@ -16,7 +16,7 @@ import gc # 3rd party imports import six -from mantid.py3compat import Enum +from enum import Enum from .observabledictionary import DictionaryAction, ObservableDictionary diff --git a/qt/applications/workbench/workbench/plotting/observabledictionary.py b/qt/applications/workbench/workbench/plotting/observabledictionary.py index 043f4f79ab1e158e30709a80c2a38df9b860048a..5e0fdc9689a24f1a0493faf7de43324ca172043a 100644 --- a/qt/applications/workbench/workbench/plotting/observabledictionary.py +++ b/qt/applications/workbench/workbench/plotting/observabledictionary.py @@ -7,7 +7,7 @@ # This file is part of the mantid workbench. # # -from mantid.py3compat import Enum +from enum import Enum class DictionaryAction(Enum): diff --git a/qt/python/mantidqt/plotting/figuretype.py b/qt/python/mantidqt/plotting/figuretype.py index ded51b8e3e4370f4da1f4b1f94f32d85eaf9fcd7..bd9456e9aadce5b136c6a302eb4551f9381a339a 100644 --- a/qt/python/mantidqt/plotting/figuretype.py +++ b/qt/python/mantidqt/plotting/figuretype.py @@ -13,7 +13,7 @@ Provides facilities to check plot types from __future__ import absolute_import # third party -from mantid.py3compat import Enum +from enum import Enum from matplotlib.container import ErrorbarContainer diff --git a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py index 37173c37ec5ac95fc4bb0417b46eca3347805488..1c62cdafd877eec38221fba9e671a9c0fec376cd 100644 --- a/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py +++ b/qt/python/mantidqt/widgets/embedded_find_replace_dialog/presenter.py @@ -7,7 +7,7 @@ # This file is part of the mantidqt package from __future__ import (absolute_import, division, print_function) -from mantid.py3compat import Enum +from enum import Enum from mantidqt.widgets.embedded_find_replace_dialog.view import EmbeddedFindReplaceDialogView diff --git a/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py b/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py index 46a4e82df002fb8d5729a013fb0242cb87e9f59a..ba144112e5792eeca3570d4d873afa2513ce8b5e 100644 --- a/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py +++ b/qt/python/mantidqt/widgets/workspacedisplay/matrix/table_view_model.py @@ -12,7 +12,7 @@ from __future__ import (absolute_import, division, print_function) from qtpy import QtGui from qtpy.QtCore import QVariant, Qt, QAbstractTableModel -from mantid.py3compat import Enum +from enum import Enum class MatrixWorkspaceTableViewModelType(Enum): diff --git a/qt/python/mantidqt/widgets/workspacedisplay/table/plot_type.py b/qt/python/mantidqt/widgets/workspacedisplay/table/plot_type.py index 692b452f2d41dcd8daa267940e408980fe5962a0..a74e08595fa9dad9dbc11ef2f4497f8955a24989 100644 --- a/qt/python/mantidqt/widgets/workspacedisplay/table/plot_type.py +++ b/qt/python/mantidqt/widgets/workspacedisplay/table/plot_type.py @@ -1,4 +1,4 @@ -from mantid.py3compat import Enum +from enum import Enum class PlotType(Enum): diff --git a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py index d21766a43f084fb0796f32b08e98631a9def983c..300d9f1dcd464bdb77a46dc74aebe10fcb55519f 100644 --- a/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py +++ b/scripts/Muon/GUI/Common/results_tab_widget/results_tab_model.py @@ -9,7 +9,7 @@ from __future__ import (absolute_import, division, unicode_literals) from mantid.api import AnalysisDataService as ads, WorkspaceFactory from mantid.kernel import FloatTimeSeriesProperty -from mantid.py3compat import Enum +from enum import Enum from mantidqt.utils.observer_pattern import GenericObserver