Merge pull request #750 from mantidproject/fix_coverage_covering_too_…

…much

.coveragerc

@@ -0,0 +1,33 @@
+[run]
+branch = True
+omit =
+    */test/*
+    */tests/*
+    */__main__.py
+    mantidimaging/main.py
+    mantidimaging/ipython.py
+    mantidimaging/test_helpers/*
+source =
+    mantidimaging
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Have to re-enable the standard pragma
+    pragma: no cover
+
+    # Don't complain about missing debug-only code:
+    def __repr__
+    if self\.debug
+
+    # Don't complain if tests don't hit defensive assertion code:
+    raise AssertionError
+    raise NotImplementedError
+
+    # Don't complain if tests never check a lack of Import as they should always be present in tests
+    except ImportError:
+
+    # Don't complain if non-runnable code isn't run:
+    if 0:
+    if __name__ == .__main__.:
+    if TYPE_CHECKING:

mantidimaging/core/data/utility.py

@@ -6,7 +6,7 @@
 from mantidimaging.core.utility.sensible_roi import SensibleROI
 
 if TYPE_CHECKING:
-    from mantidimaging.core.data import Images
+    from mantidimaging.core.data import Images  # pragma: no cover
 
 
 def mark_cropped(images: 'Images', roi: SensibleROI):

mantidimaging/core/io/loader/loader.py

@@ -53,14 +53,14 @@ def supported_formats():
     try:
         from skimage import io as skio  # noqa: F401
         skio_available = True
-    except ImportError:
-        skio_available = False
+    except ImportError:  # pragma: no cover
+        skio_available = False  # pragma: no cover
 
     try:
         import astropy.io.fits as fits  # noqa: F401
         fits_available = True
-    except ImportError:
-        fits_available = False
+    except ImportError:  # pragma: no cover
+        fits_available = False  # pragma: no cover
 
     avail_list = \
         (['fits', 'fit'] if fits_available else []) + \

mantidimaging/core/operations/base_filter.py

@@ -10,8 +10,8 @@
 from mantidimaging.core.data import Images
 
 if TYPE_CHECKING:
-    from PyQt5.QtWidgets import QFormLayout, QWidget  # noqa: F401
-    from mantidimaging.gui.mvp_base import BaseMainWindowView
+    from PyQt5.QtWidgets import QFormLayout, QWidget  # noqa: F401   # pragma: no cover
+    from mantidimaging.gui.mvp_base import BaseMainWindowView  # pragma: no cover
 
 
 class FilterGroup(Enum):

mantidimaging/core/operations/median_filter/median_filter.py

@@ -17,7 +17,7 @@
 from mantidimaging.gui.utility.qt_helpers import Type
 
 if TYPE_CHECKING:
-    from PyQt5.QtWidgets import QFormLayout
+    from PyQt5.QtWidgets import QFormLayout  # pragma: no cover
 
 
 class MedianFilter(BaseFilter):

mantidimaging/gui/dialogs/cor_inspection/presenter.py

@@ -15,7 +15,7 @@
 from .types import ImageType
 
 if TYPE_CHECKING:
-    from .view import CORInspectionDialogView
+    from .view import CORInspectionDialogView  # pragma: no cover
 
 LOG = getLogger(__name__)
 

mantidimaging/gui/dialogs/cor_inspection/recon_slice_view.py

@@ -11,7 +11,7 @@
 from mantidimaging.gui.dialogs.cor_inspection.types import ImageType
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.dialogs.cor_inspection import CORInspectionDialogView
+    from mantidimaging.gui.dialogs.cor_inspection import CORInspectionDialogView  # pragma: no cover
 
 
 class CompareSlicesView(GraphicsLayoutWidget):

mantidimaging/gui/dialogs/multiple_stack_select/view.py

@@ -6,7 +6,7 @@
 from PyQt5.QtWidgets import QDialog, QGridLayout, QPushButton
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main.view import MainWindowView
+    from mantidimaging.gui.windows.main.view import MainWindowView  # pragma: no cover
 
 
 class MultipleStackSelect(QDialog):

mantidimaging/gui/dialogs/op_history_copy/presenter.py

@@ -11,8 +11,8 @@
 from ...utility.common import operation_in_progress
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.dialogs.op_history_copy import OpHistoryCopyDialogView
-    from mantidimaging.gui.windows.main import MainWindowView
+    from mantidimaging.gui.dialogs.op_history_copy import OpHistoryCopyDialogView  # pragma: no cover
+    from mantidimaging.gui.windows.main import MainWindowView  # pragma: no cover
 
 
 class OpHistoryCopyDialogPresenter(BasePresenter):

mantidimaging/gui/mvp_base/presenter.py

@@ -5,7 +5,7 @@
 from typing import TYPE_CHECKING, Union
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.mvp_base import BaseMainWindowView, BaseDialogView
+    from mantidimaging.gui.mvp_base import BaseMainWindowView, BaseDialogView  # pragma: no cover
 
 
 class BasePresenter(object):

mantidimaging/gui/utility/qt_helpers.py

@@ -18,7 +18,7 @@
 from mantidimaging.core.utility import finder
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.widgets.stack_selector import StackSelectorWidgetView
+    from mantidimaging.gui.widgets.stack_selector import StackSelectorWidgetView  # pragma: no cover
 
 
 class BlockQtSignals(object):

mantidimaging/gui/widgets/stack_selector/presenter.py

@@ -11,7 +11,7 @@
 from mantidimaging.gui.utility import BlockQtSignals
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.widgets.stack_selector import StackSelectorWidgetView
+    from mantidimaging.gui.widgets.stack_selector import StackSelectorWidgetView  # pragma: no cover
 
 
 class Notification(Enum):

mantidimaging/gui/widgets/stack_selector/view.py

@@ -8,7 +8,7 @@
 from .presenter import (StackSelectorWidgetPresenter, Notification)
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main import MainWindowView
+    from mantidimaging.gui.windows.main import MainWindowView  # pragma: no cover
 
 
 class StackSelectorWidgetView(Qt.QComboBox):

mantidimaging/gui/widgets/stack_selector_dialog/stack_selector_dialog.py

@@ -6,7 +6,7 @@
 from mantidimaging.gui.widgets.stack_selector import StackSelectorWidgetView
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main.view import MainWindowView
+    from mantidimaging.gui.windows.main.view import MainWindowView  # pragma: no cover
 
 
 class StackSelectorDialog(QDialog):

mantidimaging/gui/windows/load_dialog/presenter.py

@@ -15,7 +15,7 @@
 from mantidimaging.gui.windows.load_dialog.field import Field
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.load_dialog import MWLoadDialog
+    from mantidimaging.gui.windows.load_dialog import MWLoadDialog  # pragma: no cover
 logger = getLogger(__name__)
 
 

mantidimaging/gui/windows/main/presenter.py

@@ -20,7 +20,7 @@
 from .model import MainWindowModel
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main import MainWindowView
+    from mantidimaging.gui.windows.main import MainWindowView  # pragma: no cover
 
 
 class Notification(Enum):

mantidimaging/gui/windows/operations/model.py

@@ -10,9 +10,9 @@
 from mantidimaging.gui.mvp_base import BaseMainWindowView
 
 if TYPE_CHECKING:
-    from PyQt5.QtWidgets import QFormLayout  # noqa: F401
-    from mantidimaging.gui.windows.operations import FiltersWindowPresenter
-    from mantidimaging.gui.windows.stack_visualiser import StackVisualiserView
+    from PyQt5.QtWidgets import QFormLayout  # noqa: F401  # pragma: no cover
+    from mantidimaging.gui.windows.operations import FiltersWindowPresenter  # pragma: no cover
+    from mantidimaging.gui.windows.stack_visualiser import StackVisualiserView  # pragma: no cover
 
 
 def ensure_tuple(val):

mantidimaging/gui/windows/operations/presenter.py

@@ -23,8 +23,8 @@
 from .model import FiltersWindowModel
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main import MainWindowView
-    from mantidimaging.gui.windows.operations import FiltersWindowView
+    from mantidimaging.gui.windows.main import MainWindowView  # pragma: no cover
+    from mantidimaging.gui.windows.operations import FiltersWindowView  # pragma: no cover
 
 
 class Notification(Enum):

mantidimaging/gui/windows/operations/view.py

@@ -20,7 +20,7 @@
 from .presenter import Notification as PresNotification
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main import MainWindowView  # noqa:F401
+    from mantidimaging.gui.windows.main import MainWindowView  # noqa:F401  # pragma: no cover
 
 
 class FiltersWindowView(BaseMainWindowView):

mantidimaging/gui/windows/recon/model.py

@@ -18,7 +18,7 @@
 from mantidimaging.gui.windows.recon.point_table_model import CorTiltPointQtModel
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.stack_visualiser import StackVisualiserView
+    from mantidimaging.gui.windows.stack_visualiser import StackVisualiserView  # pragma: no cover
 
 LOG = getLogger(__name__)
 

mantidimaging/gui/windows/recon/presenter.py

@@ -19,7 +19,7 @@
 LOG = getLogger(__name__)
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.recon.view import ReconstructWindowView
+    from mantidimaging.gui.windows.recon.view import ReconstructWindowView  # pragma: no cover
 
 
 class AutoCorMethod(Enum):

mantidimaging/gui/windows/recon/view.py

@@ -20,8 +20,8 @@
 from mantidimaging.gui.windows.recon.presenter import ReconstructWindowPresenter
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main import MainWindowView  # noqa:F401
-    from mantidimaging.gui.windows.stack_visualiser.view import StackVisualiserView
+    from mantidimaging.gui.windows.main import MainWindowView  # noqa:F401  # pragma: no cover
+    from mantidimaging.gui.windows.stack_visualiser.view import StackVisualiserView  # pragma: no cover
 
 
 class ReconstructWindowView(BaseMainWindowView):

mantidimaging/gui/windows/stack_choice/presenter.py

@@ -10,7 +10,7 @@
 from mantidimaging.gui.windows.stack_choice.view import Notification, StackChoiceView
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.operations.presenter import FiltersWindowPresenter
+    from mantidimaging.gui.windows.operations.presenter import FiltersWindowPresenter  # pragma: no cover
 
 
 def _get_stack_from_uuid(original_stack, stack_uuid):

mantidimaging/gui/windows/stack_choice/view.py

@@ -15,8 +15,8 @@
 from mantidimaging.gui.widgets.mi_image_view.view import MIImageView
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.stack_choice.compare_presenter import StackComparePresenter
-    from mantidimaging.gui.windows.stack_choice.presenter import StackChoicePresenter
+    from mantidimaging.gui.windows.stack_choice.compare_presenter import StackComparePresenter  # pragma: no cover
+    from mantidimaging.gui.windows.stack_choice.presenter import StackChoicePresenter  # pragma: no cover
 
 
 class Notification(Enum):

mantidimaging/gui/windows/stack_visualiser/presenter.py

@@ -15,7 +15,7 @@
 from ...utility.common import operation_in_progress
 
 if TYPE_CHECKING:
-    from .view import StackVisualiserView
+    from .view import StackVisualiserView  # pragma: no cover
 
 
 class SVNotification(IntEnum):

mantidimaging/gui/windows/stack_visualiser/view.py

@@ -19,7 +19,7 @@
 from .presenter import SVNotification
 
 if TYPE_CHECKING:
-    from mantidimaging.gui.windows.main import MainWindowView  # noqa:F401
+    from mantidimaging.gui.windows.main import MainWindowView  # noqa:F401   # pragma: no cover
 
 
 class StackVisualiserView(BaseMainWindowView):