Update versions (#1592)

mantidproject · Sep 1, 2022 · cc77cf3 · cc77cf3
2 parents 9ec1e2b + c5e9bc7
commit cc77cf3
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 13 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -24,9 +24,9 @@ authors:
     orcid: https://orcid.org/0000-0002-7495-8655
 title: "Mantid Imaging"
 abstract: "Mantid Imaging is a graphical toolkit for performing 3D reconstruction of neutron tomography data.  It provides an easy-to-use graphical interface to a wide range of pre/post-processing operations, tilt correction and reconstruction algorithms, accommodating for tomography users with varying data complexity and image analysis background knowledge. It utilises a flexible plugin system that allows easy integration of external software, and has allowed us to re-use software widely known in the neutron tomography community."
-version: "2.3.0"
+version: "2.4.0"
 doi: 10.5281/zenodo.4728059
-date-released: 2022-02-25
+date-released: 2022-09-01
 license: "GPL-3.0-or-later"
 repository-code: https://github.com/mantidproject/mantidimaging
 url: https://mantidproject.github.io/mantidimaging

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # MantidImaging
 
+Mantid Imaging is a graphical toolkit for performing 3D reconstruction of neutron tomography data. It provides an easy-to-use graphical interface to a wide range of pre/post-processing operations, tilt correction and reconstruction algorithms, accommodating for tomography users with varying data complexity and image analysis background knowledge. It utilises a flexible plugin system that allows easy integration of external software, and has allowed us to re-use software widely known in the neutron tomography community.
+
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4728059.svg)](https://doi.org/10.5281/zenodo.4728059)
 [![Coverage Status](https://coveralls.io/repos/github/mantidproject/mantidimaging/badge.svg?branch=main)](https://coveralls.io/github/mantidproject/mantidimaging?branch=main)
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -77,7 +77,7 @@
 # The short X.Y version.
 version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.4.0a1'
+release = '2.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/index.rst b/docs/index.rst
@@ -1,14 +1,8 @@
 MantidImaging
 =============
 
-MantidImaging is a graphical toolkit for performing 3D reconstruction of neutron
-tomography data.
+Mantid Imaging is a graphical toolkit for performing 3D reconstruction of neutron tomography data. It provides an easy-to-use graphical interface to a wide range of pre/post-processing operations, tilt correction and reconstruction algorithms, accommodating for tomography users with varying data complexity and image analysis background knowledge. It utilises a flexible plugin system that allows easy integration of external software, and has allowed us to re-use software widely known in the neutron tomography community.
 
-The toolkit performs the essential image correction/filtering and
-reconstruction. For more general purpose image processing see `Fiji
-<https://fiji.sc/>`_. Volume rendering and visualisation can be done with tools
-such as `Avizo
-<http://www.fei-software-center.com/avizo/packagedownload-ac2ae0df/>`_.
 
 .. toctree::
    :maxdepth: 1
@@ -32,6 +26,6 @@ such as `Avizo
 
 Please cite as:
 
-Tasev, Dimitar; Akello-Egwel, Dolica; Baust, Rachel; Gigg, Martyn; Jones, Samuel; Nixon, Daniel; Stock, Samuel; Taylor, Will; & Tygier, Sam. (2021). Mantid Imaging (2.3.0), Zenodo https://doi.org/10.5281/zenodo.4728059
+Tasev, Dimitar; Akello-Egwel, Dolica; Baust, Rachel; Gigg, Martyn; Jones, Samuel; Nixon, Daniel; Stock, Samuel; Taylor, Will; & Tygier, Sam. (2022). Mantid Imaging (2.4.0), Zenodo https://doi.org/10.5281/zenodo.4728059
 
 (See `Zenodo <https://doi.org/10.5281/zenodo.4728059>`_ for citing specific versions).
diff --git a/mantidimaging/__init__.py b/mantidimaging/__init__.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2022 ISIS Rutherford Appleton Laboratory UKRI
 # SPDX - License - Identifier: GPL-3.0-or-later
 
-__version__ = '2.4.0a1'
+__version__ = '2.4.0'
 """
 The gui package is not imported here, because it will pull in all of PyQt
 packages, which we do not want when using only the CLI. This is both a speedup

diff --git a/setup.py b/setup.py
@@ -215,7 +215,7 @@ def run(self):
 
 setup(
     name="mantidimaging",
-    version="2.4.0a1",
+    version="2.4.0",
     packages=find_packages(),
     package_data={
         "mantidimaging.gui": ["ui/*.ui", "ui/images/*.png", "windows/wizard/*.yml"],