From d3b798acb605721cbf54c107cf8f17bc4ed5f34f Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Thu, 24 Feb 2022 16:34:44 +0000
Subject: [PATCH 1/2] Update versions to 2.3

---
 CITATION.cff              | 2 +-
 docs/conf.py              | 6 +++---
 mantidimaging/__init__.py | 2 +-
 setup.py                  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CITATION.cff b/CITATION.cff
index b32ebb9c311..d88cd5d1a28 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -21,7 +21,7 @@ authors:
   - family-names: Baust
     given-names: Rachel
 title: "Mantid Imaging"
-version: "2.2.0"
+version: "2.3.0"
 doi: 10.5281/zenodo.4728059
 date-released: 2021-04-29
 license: "GPL-3.0-or-later"
diff --git a/docs/conf.py b/docs/conf.py
index 7320c4da04e..5d6e437a8b7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,8 +66,8 @@
 
 # General information about the project.
 project = u'MantidImaging'
-copyright = u'2017-2020, Mantid Project'
-author = u'Dimitar Tasev, Dan Nixon'
+copyright = u'2017-2022, Mantid Project'
+author = u'Dimitar Tasev, Dan Nixon, Samuel Jones, Sam Tygier, Dolica Akello-Egwel, Will Taylor, Rachel Baust'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -76,7 +76,7 @@
 # The short X.Y version.
 version = u'2.3'
 # The full version, including alpha/beta/rc tags.
-release = u'2.3.0a'
+release = u'2.3.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/mantidimaging/__init__.py b/mantidimaging/__init__.py
index c429ae20983..ac524071b16 100644
--- 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.3.0a'
+__version__ = '2.3.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
index 104cf3a9b85..ee65c6312d6 100644
--- a/setup.py
+++ b/setup.py
@@ -215,7 +215,7 @@ def run(self):
 
 setup(
     name="mantidimaging",
-    version="2.3.0a",
+    version="2.3.0",
     packages=find_packages(),
     package_data={
         "mantidimaging.gui": ["ui/*.ui", "ui/images/*.png", "windows/wizard/*.yml"],

From 65c7cdf6b7f44c6e090a0d671b65b0bb16959152 Mon Sep 17 00:00:00 2001
From: Sam Tygier <sam.tygier@stfc.ac.uk>
Date: Fri, 25 Feb 2022 11:19:14 +0000
Subject: [PATCH 2/2] github action rule syntax fix

The ${{ }} are unnecessary in an if rule and caused wrong evaluation of the expression.
---
 .github/workflows/conda.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/conda.yml b/.github/workflows/conda.yml
index 513acb3059e..26f98cefc7b 100644
--- a/.github/workflows/conda.yml
+++ b/.github/workflows/conda.yml
@@ -90,7 +90,7 @@ jobs:
         timeout-minutes: 15
 
       - name: GUI Tests Screenshots Applitools
-        if: ${{ github.event_name == 'pull_request' }}
+        if: github.event_name == 'pull_request'
         shell: bash -l {0}
         env:
           APPLITOOLS_API_KEY: ${{ secrets.APPLITOOLS_API_KEY }}
@@ -109,7 +109,7 @@ jobs:
           coveralls
 
       - name: publish 'unstable' package
-        if: ${{ github.event_name == 'push' }}  && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release'))
+        if: github.event_name == 'push'  && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release'))
         uses: ./.github/actions/publish-package
         with:
           label: unstable