Changeset 8d2f5bb in sasview

Timestamp:

Dec 16, 2011 1:58:11 PM (13 years ago)

Author:

Mathieu Doucet <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

0cbdaf0

Parents:

2855c6f

Message:

Re #3 improve versioning

Files:

• build_tools/get_version.py (modified) (2 diffs)
• sansview/__init__.py (modified) (1 diff)
• sansview/local_config.py (modified) (1 diff)

build_tools/get_version.py

@@ +1 @@
+import os
 __revision__ = filter(str.isdigit, "$Revision$")
 __version__ = "0.0.0"
@@ -43 +44 @@
     print "Could not load sansview module"
     
+print "SansView v ", __version__, __revision__

sansview/__init__.py

@@ -1 +1 @@
 __version__ = "2.0.1"
-__is_release__ = False
+
+try:
+    import pkg_resources
+    d = pkg_resources.get_distribution("sansview")
+    rev = int(d.parsed_version[5])
+    __build__ = str(rev)
+except:
+    __build__ = "1"

sansview/local_config.py

@@ -5 +5 @@
 import os
 from sans.guiframe.gui_style import GUIFRAME
+import sans.sansview
+
 # Version of the application
 __appname__ = "SansView"
-__version__ = '2.0.1'
-__build__ = '2.0.1'
+__version__ = sans.sansview.__version__
+__build__ = sans.sansview.__build__
 __download_page__ = 'http://danse.chem.utk.edu'
 __update_URL__ = 'http://danse.chem.utk.edu/sansview_version.php'