Changeset 5bba43d in sasview

Timestamp:

Feb 10, 2019 1:35:21 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

2b3eb3d, 4d06668

Parents:

3d5e629 (diff), 5e16b30 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (02/10/19 13:35:21)

git-committer:

GitHub <noreply@…> (02/10/19 13:35:21)

Message:

Merge pull request #205 from SasView?/Prep4Release4_2_1

Prep4 release4 2 1

Merging into master ready for tagging a release.

Files:

• LICENSE.TXT (modified) (1 diff)
• docs/sphinx-docs/source/conf.py (modified) (3 diffs)
• docs/sphinx-docs/source/user/RELEASE.rst (modified) (2 diffs)
• installers/license.txt (modified) (1 diff)
• src/sas/sasview/__init__.py (modified) (1 diff)
• src/sas/sasview/local_config.py (modified) (4 diffs)

LICENSE.TXT

@@ -1 @@
-Copyright (c) 2009-2018, SasView Developers
+Copyright (c) 2009-2019, SasView Developers
 All rights reserved.
 

docs/sphinx-docs/source/conf.py

@@ -25 +25 @@
 print("-- path --")
 print("\n".join(sys.path))
+
+#need to import src.sas.sasview init to access version number and dates
+#use abspath as above to locate then import
+sasview_path = os.path.abspath('../../../src/sas')
+sys.path.append(sasview_path)
+import sas.sasview
 
 # -- General configuration -----------------------------------------------------
@@ -71 +77 @@
 
 # General information about the project.
+copyright_date = sas.sasview.__release_date__
 project = u'SasView'
-copyright = u'2018, The SasView Project'
+copyright = u'%s, The SasView Project' % copyright_date
 
 # The version info for the project you're documenting, acts as replacement for
@@ -79 +86 @@
 #
 # The short X.Y version.
-version = '4.2'
-# The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+version = ".".join(sas.sasview.__version__.split(".", 2)[0:2]) 
+# The full version, including ax/bx tags Note strict version is enforced.
+release = sas.sasview.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation

docs/sphinx-docs/source/user/RELEASE.rst

@@ -9 +9 @@
 Features
 ========
+
+New in Version 4.2.1
+--------------------
+The major changes for this point release were to fix several problems with using
+the built in editor to create new models and to bring the NXcanSAS reader into
+compliance with the final published specification.  The orignal reader was
+based on a draft version of the specification.  As an early adopter,
+interpretation and implementation of the spec was iterated with all producers
+of NXcanSAS reduced data known to the SasView team in order to ensure
+compatibility and verify the implementation.  A few other enhancements and bug
+fixed were also introduced such as cleaning up the resolution section of the
+fitting page GUI, increasing the max size range allowed in the corfunc
+analysis, and adding the incomplete gamma function to the python library. 
+
+Resolved Issues
+^^^^^^^^^^^^^^^
+* Fixes #  976: CanSas HDF reader will not read all valid CanSas HDF (NXcanSAS) files
+* Fixes # 1074: Add incomplete gamma function to sasmodels
+* Fixes # 1111: Convert all input Q units to 1/A
+* Fixes # 1129: NXcanSAS writer not writing all meta data
+* Fixes # 1142: Plugin framework is broken
+* Fixes # 1183: Test from creating new model reset all parameters to default in all open FitPages
+* Fixes # 1188:   Colons removed from magnetic parameter names to address Python variable issue - done in 4.2. but documented in 4.2.1
+* Fixes # 1205: 4.2 set weighting choice seems to be ignored.
+* Fixes # 1206: Incorrect (and confusing) presentation of dQ from data in instrumental smearing section
+* Fixes # 1212: Bug in Iqxqy plotting non rectangular / square matrices?
+* Fixes # 1221: ABS reader does not read in USANS data properly GitHub
+* Fixes # 1222: smearing options incorrect on show2D and show1D in fitpage14: Loading a saved project is really really slow
+* Fixes # 1223: Expand permitted range of transformed data in Corfunc implementation
+
 
 New in Version 4.2.0
@@ -126 +156 @@
 * Fixes # 784: Add 3D integral to Correlation Function analysis
 * Fixes # 786: core_shell_parallelepiped 1-D model is incorrect
-* Fixes # 818: “report button” followed by “save” makes an empty pdf file???
+* Fixes # 818: “report button” followed by “save” makes an empty pdf file???
 * Fixes # 830: Check compliance of loader against NXcanSAS-1.0 release
 * Fixes # 838: Fix model download from marketplace

installers/license.txt

@@ -20 +20 @@
 SasView is free to download and use, including for commercial purposes.
 
-© 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS, BAM  
+© 2009-2019 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS, BAM  
 
 

src/sas/sasview/__init__.py

@@ -1 @@
-__version__ = "4.2.0"
+from distutils.version import StrictVersion
+__version__ = "4.2.1"
+StrictVersion(__version__)
+__DOI__ = "Zenodo, 10.5281/zenodo.2561236"
+__release_date__ = "2019"
 __build__ = "GIT_COMMIT"

src/sas/sasview/local_config.py

@@ -16 +16 @@
 __appname__ = "SasView"
 __version__ = sas.sasview.__version__
+__DOI__ = sas.sasview.__DOI__
+__release_date__ = sas.sasview.__release_date__
 __build__ = sas.sasview.__build__
 __download_page__ = 'https://github.com/SasView/sasview/releases'
@@ -36 +38 @@
 _do_tutorial = True
 _acknowledgement_preamble =\
-'''To ensure the long term support and development of this software please''' +\
-''' remember to:'''
+'''To ensure the long term support and development of this software please
+remember to:'''
 _acknowledgement_preamble_bullet1 =\
 '''Acknowledge its use in your publications as :'''
@@ -47 +49 @@
 '''Send us your reference for our records: developers@sasview.org'''
 _acknowledgement_publications = \
-'''This work benefited from the use of the SasView application, originally developed under NSF Award DMR-0520547. SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project Grant No 654000.'''
+("This work benefited from the use of the SasView application, originally"
+"developed under NSF Award DMR-0520547. SasView also contains code developed"
+"with funding from the EU Horizon 2020 programme under the SINE2020 project"
+"Grant No 654000.")
 _acknowledgement_citation = \
-'''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041'''
+'''M. Doucet et al. SasView Version %s, %s''' % (__version__, __DOI__)
 _acknowledgement =  \
-'''This work was originally developed as part of the DANSE project funded by the US NSF under Award DMR-0520547,\n but is currently maintained by a collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS, BAM and the scattering community.\n\n SasView also contains code developed with funding from the EU Horizon 2020 programme under the SINE2020 project (Grant No 654000).\nA list of individual contributors can be found at: http://www.sasview.org/contact.html
-'''
+("This work was originally developed as part of the DANSE project funded by"
+"the US NSF under Award DMR-0520547,\n but is currently maintained by a"
+"collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft,"
+"DLS, BAM and the scattering community.\n\n SasView also contains code"
+"developed with funding from the EU Horizon 2020 programme under the SINE2020"
+"project (Grant No 654000).\nA list of individual contributors can be found"
+"at: http://www.sasview.org/contact.html")
 
 _homepage = "http://www.sasview.org"
@@ -95 +105 @@
 _corner_image = os.path.join(icon_path, "angles_flat.png")
 _welcome_image = os.path.join(icon_path, "SVwelcome.png")
-_copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM"
+_copyright = ("(c) 2009 - %s, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO,"
+              "TU Delft, DLS and BAM") % __release_date__
 marketplace_url = "http://marketplace.sasview.org/"