Changeset 7c105e8 in sasview

Timestamp:

May 2, 2017 8:32:16 PM (8 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:

c6bdb3b

Parents:

ed03b99

Message:

make run.py work again

Files:

• run.py (modified) (1 diff)
• src/sas/logger_config.py (moved) (moved from src/sas/sasview/logger_config.py)
• src/sas/logging.ini (moved) (moved from src/sas/sasview/logging.ini)
• src/sas/sasview/__init__.py (modified) (1 diff)
• src/sas/sasview/sasview.py (modified) (5 diffs)

run.py

@@ -139 +139 @@
     sys.path.append(build_path)
 
+    set_git_tag()
     # print "\n".join(sys.path)
+
+def set_git_tag():
+    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)
+        import sas.sasview
+        sas.sasview.__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))
 
 

src/sas/sasview/__init__.py

@@ -1 +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))

src/sas/sasview/sasview.py

@@ -16 +16 @@
 import sys
 import traceback
-
-from sas.sasview.logger_config import SetupLogger
+import logging
 
 reload(sys)
 sys.setdefaultencoding("iso-8859-1")
-
-logger = SetupLogger(__name__).config_production()
-# Log the start of the session
-logger.info(" --- SasView session started ---")
-# Log the python version
-logger.info("Python: %s" % sys.version)
-
 
 PLUGIN_MODEL_DIR = 'plugin_models'
@@ -39 +31 @@
         """
         """
+        logger = logging.getLogger(__name__)
+
         from sas.sasgui.guiframe.gui_manager import SasViewApp
         self.gui = SasViewApp(0)
@@ -119 +113 @@
 
 def setup_logging():
-    log_file = os.path.join(os.path.expanduser("~"), 'sasview.log')
-    logging.basicConfig(level=logging.INFO,
-                        format='%(asctime)s %(levelname)s %(message)s',
-                        filename=log_file,
-                        )
-    logging.captureWarnings(True)
-
-    stderr_logger = logging.getLogger('STDERR')
-    sl = StreamToLogger(stderr_logger, logging.ERROR)
-    sys.stderr = sl
-
+    from sas.logger_config import SetupLogger
+
+    logger = SetupLogger(__name__).config_production()
     # Log the start of the session
-    logging.info(" --- SasView session started ---")
-
+    logger.info(" --- SasView session started ---")
     # Log the python version
-    logging.info("Python: %s" % sys.version)
+    logger.info("Python: %s" % sys.version)
+    return logger
 
 
@@ -143 +129 @@
     # probably not be, but this can make things a little easier when upgrading to a
     # new version of wx.
+    logger = logging.getLogger(__name__)
     WX_ENV_VAR = "SASVIEW_WX_VERSION"
     if WX_ENV_VAR in os.environ:
@@ -200 +187 @@
 
 def run_cli():
+    setup_logging()
     setup_mpl()
     if len(sys.argv) == 1: