Changeset db8805f in sasview


Ignore:
Timestamp:
Feb 5, 2019 6:47:30 PM (7 months 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:
6cfbe0f
Parents:
5fcb814
Message:

Fix to PR comments

Fix spelling in release notes and changed back to single release string
in init which is parsed for the X.Y version in sphinx.conf. Also use
distutils.version.StrictVersion? to enforce strict version labels as per
Paul Kienzle.

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • docs/sphinx-docs/source/conf.py

    r7556019 rdb8805f  
    8686# 
    8787# The short X.Y version. 
    88 version = sas.sasview.__major_version__ + "." + sas.sasview.__minor_version__ 
    89 # The full version, including alpha/beta/rc tags. 
     88version = ".".join(sas.sasview.__version__.split(".", 2)[0:2])  
     89# The full version, including ax/bx tags Note strict version is enforced. 
    9090release = sas.sasview.__version__ 
    9191 
  • docs/sphinx-docs/source/user/RELEASE.rst

    r5fcb814 rdb8805f  
    1515the built in editor to create new models and to bring the NXcanSAS reader into 
    1616compliance with the final published specification.  The orignal reader was 
    17 based on a draft version of the specification.  As an eraly adopter, 
     17based on a draft version of the specification.  As an early adopter, 
    1818interpretation and implementation of the spec was iterated with all producers 
    1919of NXcanSAS reduced data known to the SasView team in order to ensure 
  • src/sas/sasview/__init__.py

    r7556019 rdb8805f  
    1 __major_version__ = "4" 
    2 __minor_version__ = "2" 
    3 __version__ = __major_version__ + "." + __minor_version__ + ".1" 
     1from distutils.version import StrictVersion 
     2__version__ = "4.2.1" 
     3StrictVersion(__version__) 
    44__DOI__ = "Zenodo, 10.5281/zenodo.1412041" 
    55__release_date__ = "2019" 
Note: See TracChangeset for help on using the changeset viewer.