Changeset db8805f in sasview

Timestamp:

Feb 5, 2019 6:47:30 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:

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:

• docs/sphinx-docs/source/conf.py (modified) (1 diff)
• docs/sphinx-docs/source/user/RELEASE.rst (modified) (1 diff)
• src/sas/sasview/__init__.py (modified) (1 diff)

docs/sphinx-docs/source/conf.py

@@ -86 +86 @@
 #
 # The short X.Y version.
-version = sas.sasview.__major_version__ + "." + sas.sasview.__minor_version__
-# The full version, including alpha/beta/rc tags.
+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__
 

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

@@ -15 +15 @@
 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 eraly adopter,
+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

src/sas/sasview/__init__.py

@@ -1 @@
-__major_version__ = "4"
-__minor_version__ = "2"
-__version__ = __major_version__ + "." + __minor_version__ + ".1"
+from distutils.version import StrictVersion
+__version__ = "4.2.1"
+StrictVersion(__version__)
 __DOI__ = "Zenodo, 10.5281/zenodo.1412041"
 __release_date__ = "2019"