Changeset 7556019 in sasview

Timestamp:

Feb 2, 2019 9:27:09 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:

5fcb814

Parents:

839f70f7

Message:

Move all remaining version specific parameters to sasview.init

Edit sphinx config to also use version and dates from sasview's init.
This should put all version specific variables into
src.sas.sasview.init.py so that we only need to change these
parameters in one place
adresses #946

Files:

• docs/sphinx-docs/source/conf.py (modified) (3 diffs)
• src/sas/sasview/__init__.py (modified) (1 diff)

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'2019, 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'
+version = sas.sasview.__major_version__ + "." + sas.sasview.__minor_version__
 # The full version, including alpha/beta/rc tags.
-release = '4.2.1'
+release = sas.sasview.__version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation

src/sas/sasview/__init__.py

@@ -1 @@
-__version__ = "4.2.1"
+__major_version__ = "4"
+__minor_version__ = "2"
+__version__ = __major_version__ + "." + __minor_version__ + ".1"
 __DOI__ = "Zenodo, 10.5281/zenodo.1412041"
 __release_date__ = "2019"