Merge pull request #3117 from SasView/fix-rc1

RC1: Fix for the release
SasView · Oct 4, 2024 · 95b4fb8 · 95b4fb8
2 parents 8e24f52 + 38de3c9
commit 95b4fb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/docs/sphinx-docs/source/conf.py b/docs/sphinx-docs/source/conf.py
@@ -87,7 +87,7 @@
 # The short X.Y version.
 version = '6.0'
 # The full version, including e.g. alpha tags (a1).
-release = '6.0.0rc1'
+release = '6.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/installers/installer.iss b/installers/installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "SasView"
-#define MyAppVersion "6.0.0rc1"
+#define MyAppVersion "6.0.0"
 #define MyAppPublisher "(c) 2009 - 2024, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft and DLS"
 #define MyAppURL "http://www.sasview.org"
 #define MyAppExeName "sasview.exe"

diff --git a/src/sas/system/version.py b/src/sas/system/version.py
@@ -1,3 +1,4 @@
-__version__ = "6.0.0rc1"
+# Version must be of the form 'X.Y.Z'. No alpha/beta/rc versioning should be set here
+__version__ = "6.0.0"
 __release_date__ = "2024"
 __build__ = "GIT_COMMIT"