Merge pull request #157 from SasView/Release_4.2.0-beta

Release 4.2.0 beta

This is a very small textual change for a beta release and has already been reviewed by Tim Snow and Steve King. I am thus merging this in preparation for the release

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.

installers/README.txt

@@ -1,6 +1,23 @@
 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 to the new infrastructure now, 
+	  including sum/multiply models
+        - Some batch slicing options have been introduced
+        - 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
+
 1- Features
 ===========
     - New in Version 4.1.2

src/sas/sasview/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "4.2.0"
+__version__ = "4.2.0-beta"
 __build__ = "GIT_COMMIT"