From a8bbba273d487ea330a418be9e5d9c5fe5d8eed8 Mon Sep 17 00:00:00 2001 From: Paul Butler Date: Thu, 5 Jul 2018 21:22:42 -0400 Subject: [PATCH 1/2] Preparing 4.2.0-beta release Changed version numbers and date. First cut at release notes updating. --- docs/sphinx-docs/source/conf.py | 4 ++-- installers/README.txt | 18 +++++++++++++++++- src/sas/sasview/__init__.py | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/docs/sphinx-docs/source/conf.py b/docs/sphinx-docs/source/conf.py index cbb3586d0b..28807d3f58 100644 --- a/docs/sphinx-docs/source/conf.py +++ b/docs/sphinx-docs/source/conf.py @@ -70,7 +70,7 @@ # General information about the project. project = u'SasView' -copyright = u'2017, The SasView Project' +copyright = u'2018, The SasView Project' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -79,7 +79,7 @@ # The short X.Y version. version = '4.2' # The full version, including alpha/beta/rc tags. -release = '4.2.0' +release = '4.2.0-beta' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/installers/README.txt b/installers/README.txt index c557f9ee16..90945155da 100644 --- a/installers/README.txt +++ b/installers/README.txt @@ -1,6 +1,22 @@ Release Notes ============= - + This is a beta pre-release version of 4.2.0. A number of fixes and changes + have been made in the year since the previous release. + Full release notes will be compiled prior to the full release 4.2.0. + Highlights are: + - Infrastucture for calculating 2D patterns from 3D orientated objects + has now been totally refactored + - Plugins have completely migrated now, including sum/multiply to the + new infrastructure + - Some batch slicing options have been introduced + - The core shell parallelepiped known issue is now fixed + - data loading improvements + - Save Project improvements(Still lots more to do) + - numerous bug fixes + - Lots of documentation enhancement + + In the meantime please report any bugs or issues found while using this beta + 1- Features =========== - New in Version 4.1.2 diff --git a/src/sas/sasview/__init__.py b/src/sas/sasview/__init__.py index f47b871915..32447d34b4 100644 --- a/src/sas/sasview/__init__.py +++ b/src/sas/sasview/__init__.py @@ -1,2 +1,2 @@ -__version__ = "4.2.0" +__version__ = "4.2.0-beta" __build__ = "GIT_COMMIT" \ No newline at end of file From 2b07b6da51eb98e0e618477f13ee8b2646eaba96 Mon Sep 17 00:00:00 2001 From: Steve K Date: Fri, 6 Jul 2018 18:27:10 +0100 Subject: [PATCH 2/2] Update README.txt Tweaked what butlerpd wrote. --- installers/README.txt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/installers/README.txt b/installers/README.txt index 90945155da..baffa166f8 100644 --- a/installers/README.txt +++ b/installers/README.txt @@ -3,16 +3,17 @@ Release Notes This is a beta pre-release version of 4.2.0. A number of fixes and changes have been made in the year since the previous release. Full release notes will be compiled prior to the full release 4.2.0. + Highlights are: - Infrastucture for calculating 2D patterns from 3D orientated objects has now been totally refactored - - Plugins have completely migrated now, including sum/multiply to the - new infrastructure + - Plugins have completely migrated to the new infrastructure now, + including sum/multiply models - Some batch slicing options have been introduced - - The core shell parallelepiped known issue is now fixed - - data loading improvements - - Save Project improvements(Still lots more to do) - - numerous bug fixes + - The known issue with the core_shell_parallelepiped is now fixed + - Several data loading improvements + - Several save Project improvements (though there are more to come) + - Numerous bug fixes - Lots of documentation enhancement In the meantime please report any bugs or issues found while using this beta