Changeset e572d4b in sasview for src/sas


Ignore:
Timestamp:
Feb 2, 2019 4:34:58 PM (6 years ago)
Author:
butler
Branches:
master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249
Children:
f38ff0b
Parents:
647d66b6
Message:

Fix local_config

Replaced hard coded version number with version number read from
init.py. Also broke up long strings to fit in 80 column (lint) and moved
zenodo information to a string at the beginning of the file.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/sasview/local_config.py

    r1b4cb41 re572d4b  
    1616__appname__ = "SasView" 
    1717__version__ = sas.sasview.__version__ 
     18__DOI__ = "Zenodo, 10.5281/zenodo.1412041" 
    1819__build__ = sas.sasview.__build__ 
    1920__download_page__ = 'https://github.com/SasView/sasview/releases' 
    … …  
    3637_do_tutorial = True 
    3738_acknowledgement_preamble =\ 
    38 '''To ensure the long term support and development of this software please''' +\ 
    39 ''' remember to:''' 
     39'''To ensure the long term support and development of this software please 
     40remember to:''' 
    4041_acknowledgement_preamble_bullet1 =\ 
    4142'''Acknowledge its use in your publications as :''' 
    … …  
    4748'''Send us your reference for our records: developers@sasview.org''' 
    4849_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.''' 
     50("This work benefited from the use of the SasView application, originally" 
     51"developed under NSF Award DMR-0520547. SasView also contains code developed" 
     52"with funding from the EU Horizon 2020 programme under the SINE2020 project" 
     53"Grant No 654000.") 
    5054_acknowledgement_citation = \ 
    51 '''M. Doucet et al. SasView Version 4.2, Zenodo, 10.5281/zenodo.1412041''' 
     55'''M. Doucet et al. SasView Version %s, %s''' % (__version__, __DOI__) 
    5256_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 ''' 
     57("This work was originally developed as part of the DANSE project funded by" 
     58"the US NSF under Award DMR-0520547,\n but is currently maintained by a" 
     59"collaboration between UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO, TU Delft," 
     60"DLS, BAM and the scattering community.\n\n SasView also contains code" 
     61"developed with funding from the EU Horizon 2020 programme under the SINE2020" 
     62"project (Grant No 654000).\nA list of individual contributors can be found" 
     63"at: http://www.sasview.org/contact.html") 
    5564 
    5665_homepage = "http://www.sasview.org" 
    … …  
    95104_corner_image = os.path.join(icon_path, "angles_flat.png") 
    96105_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" 
     106_copyright = ("(c) 2009 - 2019, UTK, UMD, NIST, ORNL, ISIS, ESS, ILL, ANSTO," 
     107              "TU Delft, DLS and BAM") 
    98108marketplace_url = "http://marketplace.sasview.org/" 
    99109 
Note: See TracChangeset for help on using the changeset viewer.