Merge branch 'master' into 475_iterations_refine_window

Author: Dimitar Tasev

.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:

docs/_static/Crop.png

@@ -14,15 +14,7 @@ The version number is expected to be in SemVer format and will be referred to as
    - ``docs/conf.py``
 - Create Git tag from ``master``: ``git tag M.m.p --sign``
 - Push the tag to the repository: ``git push M.m.p``
-- (optional) Add release notes in GitHub
-- Start the `mantidimaging-master
-  <http://builds.mantidproject.org/view/Imaging/job/mantidimaging-master/>`_
-  CI job
-- Download and extract the `build artefacts
-  <http://builds.mantidproject.org/view/Imaging/job/mantidimaging-master/lastSuccessfulBuild/artifact/>`_
-- Upload the Conda package to Anaconda Cloud: ``anaconda upload -u mantid
-  --force mantidimaging-M.m.p-py35_0.tar.bz2`` (``--force`` is required as the
-  CI job will have already uploaded this package with the ``nightly`` label)
-- Build the API documentation: ``python setup.py docs_api``
-- Build the documentation: ``python setup.py docs``
-- Upload the documentation: ``python setup.py docs_publish``
+- This should produce a conda package on https://anaconda.org/mantid/mantidimaging that is using the version from the new tag.
+  - Edit the labels on this package and add :code:`main`. This will make IDAaaS automatically pick it up when it creates the release environment.
+  - We may leave the :code:`unstable` tag, as they don't conflict with each other. It just means that there may be a point where the release and unstable environment point to the same version. This will change as soon as a new unstable version is published.
+- (optional) Add release notes in the docs GitHub