Changeset 914ba0a in sasview for src/sas/sasview/__init__.py

Timestamp:

May 2, 2017 3:58:01 PM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

d66dbcc

Parents:

74d9780 (diff), 658dd57 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge with master

File:

• src/sas/sasview/__init__.py (modified) (1 diff)

src/sas/sasview/__init__.py

@@ -1 @@
-__version__ = "4.0.0a4"
-__build__ = "1"
+__version__ = "4.1"
+__build__ = "GIT_COMMIT"
+
+import logging
+logger = logging.getLogger(__name__)
+
+try:
+    import subprocess
+    import os
+    import platform
+    FNULL = open(os.devnull, 'w')
+    if platform.system() == "Windows":
+        args = ['git', 'describe', '--tags']
+    else:
+        args = ['git describe --tags']
+    git_revision = subprocess.check_output(args,
+                    stderr=FNULL,
+                    shell=True)
+    __build__ = str(git_revision).strip()
+except subprocess.CalledProcessError as cpe:
+    logger.warning("Error while determining build number\n  Using command:\n %s \n Output:\n %s"% (cpe.cmd,cpe.output))