Migrate Rosie Disco(very Service) to Python 3.6/.7 and to Tornado

* Partial Python 2 to 3 migration, only as necessary for Rosie Disco to
  behave identically & associated tests to pass:
  * see PR metomi#2288 opening comment for full list of ported modules & tests.
* Replace underlying web framework, CherryPy to Tornado.
* Minor non-functional changes to simplify/tidy & adapt code under Tornado:
  * core API points (hello, search & query) now own sub-classes.
  * CLI arguments now options using Tornado command-line parsing module,
    e.g. now 'rosie disco --start' not '... start'. Docs updated as such.
  * 'rosie-disco' HTML template adaptations: favicon name & index page URL.

.travis.yml

@@ -4,7 +4,7 @@
 ---
 language: python
 python:
-    - 2.7
+    - 3.6
 dist: xenial
 
 before_install:

bin/rose-config

@@ -99,4 +99,4 @@
 #     optional ROSE_META_PATH
 #         Prepend `$ROSE_META_PATH` to the metadata search path.
 #-------------------------------------------------------------------------------
-exec python2 -m rose.config_cli "$@"
+exec python3 -m rose.config_cli "$@"

bin/rose-test-battery

@@ -59,16 +59,17 @@ fi
 # Recompile *.pyc files to ensure we are running the current code.
 if [[ -w 'lib/python/' ]]; then
     find 'lib/python/' -name '*.pyc' -type 'f' -delete
-    python2 -mcompileall -q 'lib/python/'
+    ### SADIE DEBUG
+    python3 -mcompileall -q 'lib/python/'
 fi
 if PROVE_OPTIONS=$(rose config t prove-options); then
     exec prove $PROVE_OPTIONS -r "${@:-t}"
 else
     if [[ -f /proc/cpuinfo ]]; then
         NPROC=$(grep -ic processor /proc/cpuinfo)
     else
-        NPROC=$(python2 -c \
-            'import multiprocessing; print multiprocessing.cpu_count()')
+        NPROC=$(python3 -c \
+            'import multiprocessing; print(multiprocessing.cpu_count())')
     fi
     exec prove -j "$NPROC" -s -r "${@:-t}"
 fi

bin/rosie-disco

@@ -20,22 +20,19 @@
 # NAME
 #     rosie disco
 #
-# SYNOPSIS
-#     rosie disco start [PORT] # start ad-hoc web service server (on PORT)
-#     rosie disco stop         # stop ad-hoc web service server
-#     rosie disco stop -y      # stop ad-hoc web service server w/o prompting
-#     rosie disco              # print status of ad-hoc web service server
-#
 # DESCRIPTION
 #     Start/stop ad-hoc Rosie suite discovery web service server.
 #
-#     For `rosie disco start`, if `PORT` is not specified, use port 8080.
-#
 # OPTIONS
-#     --non-interactive, --yes, -y
-#         (For stop only.) Switch off interactive prompting (=answer yes to
-#         everything)
-#     --service-root, -R
-#         (For start only.) Include web service name under root of URL.
+#     --start
+#         start ad-hoc web service server (on port PORT else port 8080)
+#     --port=PORT
+#         with '--start' only, start ad-hoc web service server on port PORT
+#     --stop
+#         stop ad-hoc web service server
+#     --non-interactive
+#         with '--stop' only, switch off interactive prompting (i.e.
+#         answer yes to everything)
 #-------------------------------------------------------------------------------
-exec python2 -m rosie.ws "$@"
+
+exec python3 -m rosie.ws "$@"

bin/rosie-graph

@@ -62,4 +62,4 @@
 #         A suite id to graph. If given, only the suites that are
 #         connected to this id by copy history will be graphed.
 #-------------------------------------------------------------------------------
-exec python2 -m rosie.graph "$@"
+exec python3 -m rosie.graph "$@"

bin/rosie-lookup

@@ -85,4 +85,4 @@
 #     --verbose, -v
 #         Display full info for each returned suite.
 #-------------------------------------------------------------------------------
-exec python2 -m rosie.ws_client_cli lookup "$@"
+exec python3 -m rosie.ws_client_cli lookup "$@"

bin/rosie-ls

@@ -62,4 +62,4 @@
 #     --verbose, -v
 #         Display full info for each returned suite.
 #-------------------------------------------------------------------------------
-exec python2 -m rosie.ws_client_cli list_local_suites "$@"
+exec python3 -m rosie.ws_client_cli list_local_suites "$@"

lib/bash/rose_init

@@ -31,9 +31,9 @@
 #     * load any FUNC specified in the argument list.
 #-------------------------------------------------------------------------------
 function rose_readlink_canonicalize() { # "readlink -f" is GNU extension
-    readlink -f $1 2>/dev/null || python2 - $1 <<'__PYTHON__'
+    readlink -f $1 2>/dev/null || python3 - $1 <<'__PYTHON__'
 import os, sys
-print os.path.realpath(sys.argv[1])
+print(os.path.realpath(sys.argv[1]))
 __PYTHON__
 }
 

lib/html/template/rosie-disco/index.html

@@ -3,8 +3,8 @@
 <head>
   <title>{{title}} @ {{host}}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <link rel="icon" href="{{script}}/favicon.ico" />
-  <link rel="shortcut icon" href="{{script}}/favicon.ico" />
+  <link rel="icon" href="{{script}}/rosie-favicon.png" />
+  <link rel="shortcut icon" href="{{script}}/rosie-favicon.png" />
   <link type="text/css" href="{{script}}/css/bootstrap.min.css"
   rel="stylesheet" media="screen" />
 </head>

lib/html/template/rosie-disco/prefix-index.html

@@ -4,8 +4,8 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-  <link rel="icon" href="{{script}}/favicon.ico" />
-  <link rel="shortcut icon" href="{{script}}/favicon.ico" />
+  <link rel="icon" href="{{script}}/rosie-favicon.png" />
+  <link rel="shortcut icon" href="{{script}}/rosie-favicon.png" />
   <link href="{{script}}/css/bootstrap.min.css" rel="stylesheet" />
   <link href="{{script}}/css/jquery.dataTables.css" rel="stylesheet">
   <!--link href="{{script}}/css/jquery.dataTables.colVis.min.css" rel="stylesheet"-->
@@ -27,7 +27,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="{{script}}/">
+      <a class="navbar-brand" href="/{{root_service_url}}/">
         {{prefix}}: {{title}}
         <small>@ {{host}}</small>
       </a>