Remove long deprecated run_control_script2 (#420)

Author: BrianJKoopman

docs/developer/site_config.rst

@@ -169,36 +169,3 @@ additional site-info settable from the site's parser.
 .. note::
     For examples calling these commandline arguments see
     :ref:`ocs_agent_cmdline_examples`.
-
-
-Control Clients and the Site Config
-===================================
-
-As of this writing, Control Clients do not store configuration in the
-SCF.  But there is an interim interface available for Control Clients
-to access the Site Configuration, with the usual command-line
-overrides.  Control Clients that use the ``run_control_script``
-function to launch can instead use ``run_control_script2``, which
-behaves as follows:
-
-.. autofunction:: ocs.client_t.run_control_script2
-    :noindex:
-
-The control client script might look something like this (see also
-river_ctrl.py in the examples):
-
-.. code-block:: python
-
-  def my_script(app, pargs):
-      from ocs import client_t
-
-      # We've added a --target option.
-      # Construct the full agent address.
-      agent_addr = '%s.%s' % (pargs.address_root, pargs.target)
-
-      # Create a ProcessClient for the process 'acq'.
-      cw = client_t.ProcessClient(app, agent_addr, 'acq')
-
-      print('Starting a data acquisition process...')
-      d1 = yield cw.start()
-      #...

example/nonblocking_ops/example_ctrl.py

@@ -34,4 +34,4 @@ def my_script(app, parser_args, target=None):
     # We don't pass a parser in, so it will be auto-generated and
     # populated from the command line.  We hard-code our one argument,
     # the target agent instance_id.
-    client_t.run_control_script2(my_script, target='example1')
+    client_t.run_control_script(my_script, target='example1')

ocs/client_t.py

@@ -9,15 +9,6 @@
 
 from autobahn.wamp.types import ComponentConfig
 from autobahn.twisted.wamp import ApplicationSession, ApplicationRunner
-import deprecation
-
-
-@deprecation.deprecated(
-    deprecated_in='v0.6.1',
-    details="Renamed to run_control_script"
-)
-def run_control_script2(*args, **kwargs):
-    run_control_script(*args, **kwargs)
 
 
 def run_control_script(function, parser=None, *args, **kwargs):
@@ -53,7 +44,7 @@ def run_control_script(function, parser=None, *args, **kwargs):
         from ocs import client_t, site_config
         parser = site_control.add_arguments()  # initialized ArgParser
         parser.add_option('--target')          # Options for this client
-        client_t.run_control_script2(my_script, parser=parser)
+        client_t.run_control_script(my_script, parser=parser)
 
     In the my_script function, use parser_args.target to get the
     target.