Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RC1: Fix for the release #3117

Merged
merged 4 commits into from
Oct 4, 2024
Merged

RC1: Fix for the release #3117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2d1ad6c
Reset version to match the expect form of 'X.Y.Z' and add a note for …
krzywon Oct 3, 2024
9ccf3a4
Set all versions to 6.0.0 for final release candidate
krzywon Oct 3, 2024
282f963
Setup android SDK for windows binary signing
krzywon Oct 3, 2024
38de3c9
Remove SDK installation since it is unnecessary
krzywon Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/sphinx-docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion installers/installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion src/sas/system/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Loading