Merge pull request #2244 from ganga-devs/RemoveGUI

Remove unfinished GUI code from Ganga

ganga/GangaCore/Core/InternalServices/ShutdownManager.py

@@ -16,8 +16,9 @@
 from GangaCore.Utility import stacktracer
 from GangaCore.Utility.logging import getLogger, requires_shutdown, final_shutdown
 from GangaCore.Utility.Config import setConfigOption
-from GangaCore.Core.MonitoringComponent.Local_GangaMC_Service import getStackTrace, _purge_actions_queue,\
-    stop_and_free_thread_pool
+from GangaCore.Core.MonitoringComponent.Local_GangaMC_Service import (getStackTrace,
+                                                                      _purge_actions_queue,
+                                                                      stop_and_free_thread_pool)
 from GangaCore.GPIDev.Lib.Tasks import stopTasks
 from GangaCore.GPIDev.Credentials import CredentialStore
 from GangaCore.Core.GangaRepository.SessionLock import removeGlobalSessionFiles, removeGlobalSessionFileHandlers
@@ -60,15 +61,6 @@ def _unprotected_ganga_exitfuncs():
     # Set the disk timeout to 1 sec, sacrifice stability for quicker exit
     setConfigOption('Configuration', 'DiskIOTimeout', 1)
 
-    # Stop APIServerThread - GangaGUI
-    from GangaGUI import guistate
-    if guistate.get_api_server() is not None:
-        from GangaGUI.start import stop_gui
-        try:
-            stop_gui()
-        except Exception as err:
-            logger.exception("Exception raised while stopping GUI: {}".format(err))
-
     # Stop the monitoring loop from iterating further
     if monitoring_component is not None:
         try:

ganga/GangaCore/Runtime/bootstrap.py

@@ -273,15 +273,12 @@ def parseOptions(self):
         parser.add_option("-i", dest="force_interactive", action="store_true",
                           help='enter interactive mode after running script')
 
-        parser.add_option("--webgui", dest="webgui", action="store_true", default='False',
-                          help='starts web GUI monitoring server')
-
         parser.add_option("--config", dest="config_file", action="store", metavar="FILE", default=None,
                           help=('read user configuration from FILE, overrides the GANGA_CONFIG_FILE environment variable. '
                                 'Default: ~/.gangarc'))
 
         parser.add_option("--config-path", dest='config_path', action="store", default=None,
-                          help=('site/experiment config customization path, overrides GANGA_CONFIG_PATH environment variable. '
+                          help=('site/experiment config customization path, overrides GANGA_CONFIG_PATH.'
                                 'The relative paths are resolved wrt to the release directory. '
                                 'To use a specific file you should specify the absolute path. Default: None'))
 
@@ -314,7 +311,8 @@ def parseOptions(self):
                                'to setup runtime plugin modules (affects LD_LIBRARY_PATH)')
 
         parser.add_option("--test", dest='TEST', action="store_true", default=False,
-                          help=('run Ganga test(s) using internal test-runner. It requires GangaTest package to be installed. '
+                          help=('run Ganga test(s) using internal test-runner. '
+                                'It requires GangaTest package to be installed.'
                                 'Usage example: *ganga --test Ganga/old_test/MyTestcase* . '
                                 'Refer to [TestingFramework] section in Ganga config for more '
                                 'information on how to configure the test runner.'))
@@ -1018,10 +1016,6 @@ def run(self, local_ns=None):
 
         sys.path.insert(0, '')
 
-        if self.options.webgui is True:
-            from GangaGUI.start import start_gui
-            start_gui()
-
         if local_ns is None:
             import __main__
             local_ns = __main__.__dict__
@@ -1564,4 +1558,4 @@ def launch_IPython(local_ns):
 # added docstrings for GPI objects and an interactive ganga help system based on pydoc
 #
 #
-#
+#

ganga/GangaCore/__init__.py

@@ -160,7 +160,7 @@ def getLCGRootPath():
 If an element of the path is just a name (like in the example below)
 then the plugins will be loaded using current python path. This means that
 some packages such as GangaTest may be taken from the release area.""",
-    examples="""RUNTIME_PATH = GangaGUI
+    examples="""RUNTIME_PATH = GangaDirac
 RUNTIME_PATH = /my/SpecialExtensions:GangaTest""",
 )
 
@@ -697,14 +697,6 @@ def getLCGRootPath():
     ),
 )
 
-# config.addOption('bulk_submit_time','random.uniform(1,2)',('python expression which returns the time it takes (in seconds) '
-#        'to complete the submission of a single job within the Grid.native_master_submit() command'))
-# config.addOption('bulk_submit_failure_rate',0.0,'probabilty that the Grid.native_master_submit() fails')
-
-# config.addOption('bulk_cancel_time','random.uniform(1,2)',('python expression which returns the time it takes (in seconds) '
-#        'to complete the cancellation of a single job within the Grid.native_master_cancel() command'))
-# config.addOption('bulk_cancel_failure_rate',0.0,'probabilty that the Grid.native_master_cancel() fails')
-
 gridsim_config.addOption(
     'job_id_resolved_time',
     'random.uniform(1,2)',