Changeset 54756fc in sasview

Timestamp:

Sep 2, 2016 8:02:04 AM (8 years ago)

Author:

krzywon

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:

d4e7ca0

Parents:

7b2d6fb

git-author:

Jeff Krzywon <krzywon@…> (09/02/16 08:02:04)

git-committer:

Jeff KRzywon <krzywon@…> (09/02/16 08:02:04)

Message:

Resolves #627: Modified subprocess call to be os dependant.

File:

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

sasview/__init__.py

@@ -5 +5 @@
     import subprocess
     import os
+    import platform
     FNULL = open(os.devnull, 'w')
-    git_revision = subprocess.check_output(['git describe', '--tags'],
+    if platform.system() == "Windows":
+        args = ['git', 'describe', '--tags']
+    else:
+        args = ['git describe --tags']
+    git_revision = subprocess.check_output(args,
     #git_revision = subprocess.check_output(['pwd'],
                     stderr=FNULL,