more review responses

cylc · Sep 30, 2019 · 5799b62 · 5799b62
1 parent 1b5baab
commit 5799b62
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 30 deletions.
diff --git a/cylc/flow/client_schema.py b/cylc/flow/client_schema.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+
+# THIS FILE IS PART OF THE CYLC SUITE ENGINE.
+# Copyright (C) 2008-2019 NIWA & British Crown (Met Office) & Contributors.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Define all legal items and values for cylc local client definitions.
+
+SPEC = {
+    'disable interactive command prompts': [VDR.V_BOOLEAN, True],
+}
diff --git a/cylc/flow/config_schema.py b/cylc/flow/config_schema.py
@@ -34,14 +34,6 @@
 # Nested dict of spec items.
 # Spec value is [value_type, default, allowed_2, allowed_3, ...]
 SPEC = {
-    # client
-    'disable interactive command prompts': [VDR.V_BOOLEAN, True],
-    # suite-task communication
-    'task messaging': {
-        'retry interval': [VDR.V_INTERVAL, DurationFloat(5)],
-        'maximum number of tries': [VDR.V_INTEGER, 7],
-        'connection timeout': [VDR.V_INTERVAL, DurationFloat(30)],
-    },
     'meta': {
         'description': [VDR.V_STRING, ''],
         'group': [VDR.V_STRING, ''],
@@ -70,7 +62,6 @@
         'abort if any task fails': [VDR.V_BOOLEAN, False],
         'health check interval': [VDR.V_INTERVAL, 1500],
         'task event mail interval': [VDR.V_INTERVAL, 300],
-        'log resolved dependencies': [VDR.V_BOOLEAN],
         'disable automatic shutdown': [VDR.V_BOOLEAN],
         'simulation': {
             'disable suite event handlers': [VDR.V_BOOLEAN, True],
@@ -105,21 +96,7 @@
             'abort on inactivity': [VDR.V_BOOLEAN],
         },
         'reference test': {
-            'suite shutdown event handler': [
-                VDR.V_STRING, 'cylc hook check-triggering'],
-            'required run mode': [
-                VDR.V_STRING,
-                '', 'live', 'simulation', 'dummy-local', 'dummy'],
-            'allow task failures': [VDR.V_BOOLEAN],
             'expected task failures': [VDR.V_STRING_LIST],
-            'live mode suite timeout': [
-                VDR.V_INTERVAL, DurationFloat(60)],
-            'dummy mode suite timeout': [
-                VDR.V_INTERVAL, DurationFloat(60)],
-            'dummy-local mode suite timeout': [
-                VDR.V_INTERVAL, DurationFloat(60)],
-            'simulation mode suite timeout': [
-                VDR.V_INTERVAL, DurationFloat(60)],
         },
         'authorization': {
             # Allow owners to grant public shutdown rights at the most, not
@@ -131,9 +108,6 @@
                     Priv.READ, Priv.SHUTDOWN]])
         },
     },
-    'document viewers': {
-        'html': [VDR.V_STRING, 'firefox'],
-    },
     'editors': {
         'terminal': [VDR.V_STRING, 'vim'],
         'gui': [VDR.V_STRING, 'gvim -f'],
@@ -155,7 +129,6 @@
             'batch system': [VDR.V_STRING, None],
             'cylc executable': [VDR.V_STRING, 'cylc'],
             'global init-script': [VDR.V_STRING],
-            'copyable environment variables': [VDR.V_STRING_LIST],
             'retrieve job logs': [VDR.V_BOOLEAN],
             'retrieve job logs command': [VDR.V_STRING, 'rsync -a'],
             'retrieve job logs max size': [VDR.V_STRING],
@@ -265,7 +238,6 @@
             'script': [VDR.V_STRING],
             'post-script': [VDR.V_STRING],
             'extra log files': [VDR.V_STRING_LIST],
-            'work sub-directory': [VDR.V_STRING],
             'meta': {
                 'title': [VDR.V_STRING, ''],
                 'description': [VDR.V_STRING, ''],
@@ -291,8 +263,6 @@
                 'submission polling intervals': [
                     VDR.V_INTERVAL_LIST, None
                 ],
-                'submission retry delays': [VDR.V_INTERVAL_LIST, None],
-                'owner': [VDR.V_STRING],
             },
             'platform': [VDR.V_STRING],
             'remote': {