Changeset 5bba43d in sasview


Ignore:
Timestamp:
Feb 10, 2019 1:35:21 PM (6 months 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:
6 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.TXT

    rb01252e r94cd1d6  
    1 Copyright (c) 2009-2018, SasView Developers 
     1Copyright (c) 2009-2019, SasView Developers 
    22All rights reserved. 
    33 
  • docs/sphinx-docs/source/conf.py

    rb229a3b rdb8805f  
    2525print("-- path --") 
    2626print("\n".join(sys.path)) 
     27 
     28#need to import src.sas.sasview init to access version number and dates 
     29#use abspath as above to locate then import 
     30sasview_path = os.path.abspath('../../../src/sas') 
     31sys.path.append(sasview_path) 
     32import sas.sasview 
    2733 
    2834# -- General configuration ----------------------------------------------------- 
     
    7177 
    7278# General information about the project. 
     79copyright_date = sas.sasview.__release_date__ 
    7380project = u'SasView' 
    74 copyright = u'2018, The SasView Project' 
     81copyright = u'%s, The SasView Project' % copyright_date 
    7582 
    7683# The version info for the project you're documenting, acts as replacement for 
     
    7986# 
    8087# The short X.Y version. 
    81 version = '4.2' 
    82 # The full version, including alpha/beta/rc tags. 
    83 release = '4.2.0' 
     88version = ".".join(sas.sasview.__version__.split(".", 2)[0:2])  
     89# The full version, including ax/bx tags Note strict version is enforced. 
     90release = sas.sasview.__version__ 
    8491 
    8592# The language for content autogenerated by Sphinx. Refer to documentation 
  • docs/sphinx-docs/source/user/RELEASE.rst

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

    rc6a4d143 r55fa530  
    2020SasView is free to download and use, including for commercial purposes. 
    2121 
    22 © 2009-2018 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS, BAM   
     22© 2009-2019 UMD, UTK, NIST, ORNL, ISIS, ESS, ANSTO, ILL, TUD, DLS, BAM   
    2323 
    2424 
  • src/sas/sasview/__init__.py

    rb229a3b r5e16b30  
    1 __version__ = "4.2.0" 
     1from distutils.version import StrictVersion 
     2__version__ = "4.2.1" 
     3StrictVersion(__version__) 
     4__DOI__ = "Zenodo, 10.5281/zenodo.2561236" 
     5__release_date__ = "2019" 
    26__build__ = "GIT_COMMIT" 
  • src/sas/sasview/local_config.py

    r1b4cb41 r839f70f7  
    1616__appname__ = "SasView" 
    1717__version__ = sas.sasview.__version__ 
     18__DOI__ = sas.sasview.__DOI__ 
     19__release_date__ = sas.sasview.__release_date__ 
    1820__build__ = sas.sasview.__build__ 
    1921__download_page__ = 'https://github.com/SasView/sasview/releases' 
     
    3638_do_tutorial = True 
    3739_acknowledgement_preamble =\ 
    38 '''To ensure the long term support and development of this software please''' +\ 
    39 ''' remember to:''' 
     40'''To ensure the long term support and development of this software please 
     41remember to:''' 
    4042_acknowledgement_preamble_bullet1 =\ 
    4143'''Acknowledge its use in your publications as :''' 
     
    4749'''Send us your reference for our records: developers@sasview.org''' 
    4850_acknowledgement_publications = \ 
    49 '''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.''' 
     51("This work benefited from the use of the SasView application, originally" 
     52"developed under NSF Award DMR-0520547. SasView also contains code developed" 
     53"with funding from the EU Horizon 2020 programme under the SINE2020 project" 
     54"Grant No 654000.") 
    5055_acknowledgement_citation = \ 
    51 '''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041''' 
     56'''M. Doucet et al. SasView Version %s, %s''' % (__version__, __DOI__) 
    5257_acknowledgement =  \ 
    53 '''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 
    54 ''' 
     58("This work was originally developed as part of the DANSE project funded by" 
     59"the US NSF under Award DMR-0520547,\n but is currently maintained by a" 
     60"collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft," 
     61"DLS, BAM and the scattering community.\n\n SasView also contains code" 
     62"developed with funding from the EU Horizon 2020 programme under the SINE2020" 
     63"project (Grant No 654000).\nA list of individual contributors can be found" 
     64"at: http://www.sasview.org/contact.html") 
    5565 
    5666_homepage = "http://www.sasview.org" 
     
    95105_corner_image = os.path.join(icon_path, "angles_flat.png") 
    96106_welcome_image = os.path.join(icon_path, "SVwelcome.png") 
    97 _copyright = "(c) 2009 - 2018, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft, DLS and BAM" 
     107_copyright = ("(c) 2009 - %s, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO," 
     108              "TU Delft, DLS and BAM") % __release_date__ 
    98109marketplace_url = "http://marketplace.sasview.org/" 
    99110 
Note: See TracChangeset for help on using the changeset viewer.