Skip to content

Commit

Permalink
Merge pull request #1334 from mantidproject/prep-release2
Browse files Browse the repository at this point in the history
Update versions to 2.3
  • Loading branch information
rbauststfc authored Feb 25, 2022
2 parents 3c80325 + 65c7cdf commit 351ee31
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion mantidimaging/__init__.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down

0 comments on commit 351ee31

Please sign in to comment.