##// END OF EJS Templates
remove a bunch of unused `default_config_file` assignments...
MinRK -
Show More
@@ -122,7 +122,6 b' else:'
122
122
123 class IPythonConsoleApp(Configurable):
123 class IPythonConsoleApp(Configurable):
124 name = 'ipython-console-mixin'
124 name = 'ipython-console-mixin'
125 default_config_file_name='ipython_config.py'
126
125
127 description = """
126 description = """
128 The IPython Mixin Console.
127 The IPython Mixin Console.
@@ -277,7 +277,6 b" notebook_aliases = [u'port', u'port-retries', u'ip', u'keyfile', u'certfile',"
277 class NotebookApp(BaseIPythonApplication):
277 class NotebookApp(BaseIPythonApplication):
278
278
279 name = 'ipython-notebook'
279 name = 'ipython-notebook'
280 default_config_file_name='ipython_notebook_config.py'
281
280
282 description = """
281 description = """
283 The IPython HTML Notebook.
282 The IPython HTML Notebook.
@@ -53,9 +53,6 b' from IPython.parallel.apps.baseapp import ('
53 #-----------------------------------------------------------------------------
53 #-----------------------------------------------------------------------------
54
54
55
55
56 default_config_file_name = u'ipcluster_config.py'
57
58
59 _description = """Start an IPython cluster for parallel computing.
56 _description = """Start an IPython cluster for parallel computing.
60
57
61 An IPython cluster consists of 1 controller and 1 or more engines.
58 An IPython cluster consists of 1 controller and 1 or more engines.
@@ -176,7 +173,6 b' class IPClusterStop(BaseParallelApplication):'
176 name = u'ipcluster'
173 name = u'ipcluster'
177 description = stop_help
174 description = stop_help
178 examples = _stop_examples
175 examples = _stop_examples
179 config_file_name = Unicode(default_config_file_name)
180
176
181 signal = Integer(signal.SIGINT, config=True,
177 signal = Integer(signal.SIGINT, config=True,
182 help="signal to use for stopping processes.")
178 help="signal to use for stopping processes.")
@@ -247,7 +243,6 b' class IPClusterEngines(BaseParallelApplication):'
247 description = engines_help
243 description = engines_help
248 examples = _engines_examples
244 examples = _engines_examples
249 usage = None
245 usage = None
250 config_file_name = Unicode(default_config_file_name)
251 default_log_level = logging.INFO
246 default_log_level = logging.INFO
252 classes = List()
247 classes = List()
253 def _classes_default(self):
248 def _classes_default(self):
@@ -82,10 +82,6 b' else:'
82 #-----------------------------------------------------------------------------
82 #-----------------------------------------------------------------------------
83
83
84
84
85 #: The default config file name for this application
86 default_config_file_name = u'ipcontroller_config.py'
87
88
89 _description = """Start the IPython controller for parallel computing.
85 _description = """Start the IPython controller for parallel computing.
90
86
91 The IPython controller provides a gateway between the IPython engines and
87 The IPython controller provides a gateway between the IPython engines and
@@ -156,7 +152,6 b' class IPControllerApp(BaseParallelApplication):'
156 name = u'ipcontroller'
152 name = u'ipcontroller'
157 description = _description
153 description = _description
158 examples = _examples
154 examples = _examples
159 config_file_name = Unicode(default_config_file_name)
160 classes = [ProfileDir, Session, HubFactory, TaskScheduler, HeartMonitor, DictDB] + real_dbs
155 classes = [ProfileDir, Session, HubFactory, TaskScheduler, HeartMonitor, DictDB] + real_dbs
161
156
162 # change default to True
157 # change default to True
@@ -58,9 +58,6 b' from IPython.utils.traitlets import Bool, Unicode, Dict, List, Float, Instance'
58 # Module level variables
58 # Module level variables
59 #-----------------------------------------------------------------------------
59 #-----------------------------------------------------------------------------
60
60
61 #: The default config file name for this application
62 default_config_file_name = u'ipengine_config.py'
63
64 _description = """Start an IPython engine for parallel computing.
61 _description = """Start an IPython engine for parallel computing.
65
62
66 IPython engines run in parallel and perform computations on behalf of a client
63 IPython engines run in parallel and perform computations on behalf of a client
@@ -144,7 +141,6 b' class IPEngineApp(BaseParallelApplication):'
144 name = 'ipengine'
141 name = 'ipengine'
145 description = _description
142 description = _description
146 examples = _examples
143 examples = _examples
147 config_file_name = Unicode(default_config_file_name)
148 classes = List([ZMQInteractiveShell, ProfileDir, Session, EngineFactory, Kernel, MPI])
144 classes = List([ZMQInteractiveShell, ProfileDir, Session, EngineFactory, Kernel, MPI])
149
145
150 startup_script = Unicode(u'', config=True,
146 startup_script = Unicode(u'', config=True,
@@ -40,8 +40,6 b' from IPython.parallel.apps.logwatcher import LogWatcher'
40 #-----------------------------------------------------------------------------
40 #-----------------------------------------------------------------------------
41
41
42 #: The default config file name for this application
42 #: The default config file name for this application
43 default_config_file_name = u'iplogger_config.py'
44
45 _description = """Start an IPython logger for parallel computing.
43 _description = """Start an IPython logger for parallel computing.
46
44
47 IPython controllers and engines (and your own processes) can broadcast log messages
45 IPython controllers and engines (and your own processes) can broadcast log messages
@@ -64,8 +62,6 b' class IPLoggerApp(BaseParallelApplication):'
64
62
65 name = u'iplogger'
63 name = u'iplogger'
66 description = _description
64 description = _description
67 config_file_name = Unicode(default_config_file_name)
68
69 classes = [LogWatcher, ProfileDir]
65 classes = [LogWatcher, ProfileDir]
70 aliases = Dict(aliases)
66 aliases = Dict(aliases)
71
67
@@ -58,9 +58,6 b' from IPython.utils.traitlets import ('
58 # Globals, utilities and helpers
58 # Globals, utilities and helpers
59 #-----------------------------------------------------------------------------
59 #-----------------------------------------------------------------------------
60
60
61 #: The default config file name for this application.
62 default_config_file_name = u'ipython_config.py'
63
64 _examples = """
61 _examples = """
65 ipython --pylab # start in pylab mode
62 ipython --pylab # start in pylab mode
66 ipython --pylab=qt # start in pylab mode with the qt4 backend
63 ipython --pylab=qt # start in pylab mode with the qt4 backend
@@ -203,7 +200,6 b' class LocateIPythonApp(BaseIPythonApplication):'
203 class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
200 class TerminalIPythonApp(BaseIPythonApplication, InteractiveShellApp):
204 name = u'ipython'
201 name = u'ipython'
205 description = usage.cl_usage
202 description = usage.cl_usage
206 default_config_file_name = default_config_file_name
207 crash_handler_class = IPAppCrashHandler
203 crash_handler_class = IPAppCrashHandler
208 examples = _examples
204 examples = _examples
209
205
@@ -380,7 +376,7 b' def load_default_config(ipython_dir=None):'
380 if ipython_dir is None:
376 if ipython_dir is None:
381 ipython_dir = get_ipython_dir()
377 ipython_dir = get_ipython_dir()
382 profile_dir = os.path.join(ipython_dir, 'profile_default')
378 profile_dir = os.path.join(ipython_dir, 'profile_default')
383 cl = PyFileConfigLoader(default_config_file_name, profile_dir)
379 cl = PyFileConfigLoader("ipython_config.py", profile_dir)
384 try:
380 try:
385 config = cl.load_config()
381 config = cl.load_config()
386 except ConfigFileNotFound:
382 except ConfigFileNotFound:
General Comments 0
You need to be logged in to leave comments. Login now