Skip to content

Commit

Permalink
obsolete: remove old configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
oliver-sanders committed Feb 1, 2019
1 parent a4fecde commit d130ccd
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 126 deletions.
12 changes: 0 additions & 12 deletions doc/src/appendices/site-user-config-ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ The editor to be invoked by the cylc GUI.

This section covers options for network communication between cylc
clients (suite-connecting commands and guis) servers (running suites).
Each suite listens on a dedicated network port, binding on the first
available starting at the configured base port.

By default, the communication method is HTTPS secured with HTTP Digest
Authentication. If the system does not support SSL, you should configure
Expand All @@ -271,16 +269,6 @@ Cylc defaults to HTTPS if this setting is not explicitly configured.
- **http**
- *default*: https


[communication] ``->`` proxies on
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Enable or disable proxy servers for HTTPS - disabled by default.

- *type*: boolean
- *localhost default*: False


[communication] ``->`` options
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Expand Down
4 changes: 2 additions & 2 deletions doc/src/appendices/suiterc-config-ref.rst
Original file line number Diff line number Diff line change
Expand Up @@ -324,8 +324,8 @@ to override the default templates.

Cylc has internal "hooks" to which you can attach handlers that are
called by the suite server program whenever certain events occur. This section
configures suite event hooks; see :ref:`TaskEventHandling` for
task event hooks.
configures suite events; see :ref:`TaskEventHandling` for
task events.

Event handler commands can send an email or an SMS, call a pager, intervene in
the operation of their own suite, or whatever.
Expand Down
2 changes: 1 addition & 1 deletion doc/src/tutorial.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1390,5 +1390,5 @@ and can be copied and modified at will.
- Use an *internal queue* to prevent more than an alotted number
of tasks from running at once even though they are ready -
see :ref:`InternalQueues`.
- Configure task event hooks to send an email, or shut the suite down,
- Configure task events to send an email, or shut the suite down,
on task failure.
6 changes: 0 additions & 6 deletions etc/dev-suites/dave/suite.rc
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,11 @@ background thread; (c) job submission in a background worker thread."""

{% set N_LOCAL = 10 %}
{% set N_REMOTE_PER_LOCAL = 2 %}
#[cylc]
# [[job submission]]
# delay between batches = 0
[scheduling]
initial cycle point = 20120101
final cycle point = 20120110
cycling mode = integer
max active cycle points = 100
# [[special tasks]]
# cold-start = cold_start
[[dependencies]]
[[[R1]]]
graph = """
Expand All @@ -37,7 +32,6 @@ background thread; (c) job submission in a background worker thread."""
[[[remote]]]
#host = els003
host = $(sleep 5; echo oliverh-33586DL.greta.niwa.co.nz)
#host = `rose host-select --rank-method=random`
{% for X in range( 1, N_LOCAL + 1 ) %}
{% for Y in range( 1, N_REMOTE_PER_LOCAL + 1 ) %}
[[remote_{{ X }}_{{ Y }}]]
Expand Down
2 changes: 1 addition & 1 deletion etc/examples/task-states/bin/change-my-job-sub-method.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ SUITE=$2 # name of the suite
TASKID=$3 # ID of the task
#MESSAGE="$4" # quotes required (message contains spaces)

echo "${0}:resetting job submission method with cylc broadcast"
echo "${0}:resetting job batch system with cylc broadcast"

NAME=${TASKID%.*}
CYCLE=${TASKID#*.}
Expand Down
49 changes: 7 additions & 42 deletions lib/cylc/cfgspec/globalcfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,6 @@

'communication': {
'method': [VDR.V_STRING, 'https', 'http'],
'base port': [VDR.V_INTEGER, 43001],
'maximum number of ports': [VDR.V_INTEGER, 100],
'proxies on': [VDR.V_BOOLEAN],
'options': [VDR.V_STRING_LIST],
},

Expand Down Expand Up @@ -241,7 +238,6 @@
},
}


def upg(cfg, descr):
"""Upgrader."""
add_bin_dir = converter(lambda x: x + '/bin', "Added + '/bin' to path")
Expand All @@ -251,53 +247,22 @@ def upg(cfg, descr):

u.obsolete('6.4.1', ['test battery', 'directives'])
u.obsolete('6.11.0', ['state dump rolling archive length'])
u.obsolete('6.11.0', ['cylc', 'event hooks'])
u.obsolete('7.0.0', ['pyro', 'base port'])
u.obsolete('7.0.0', ['pyro', 'ports directory'])
u.obsolete('7.0.0', ['pyro'])
u.obsolete('7.0.0', ['authentication', 'hashes'])
u.obsolete('7.0.0', ['authentication', 'scan hash'])
u.obsolete('7.6.0', ['hosts', '__MANY__', 'remote tail command template'])
u.obsolete('7.8.0', ['communication', 'maximum number of ports'])
# Roll over is always done.
u.obsolete('7.8.0', ['suite logging', 'roll over at start-up'])
u.obsolete('7.8.1', ['cylc', 'events', 'reset timer'])
u.obsolete('8.0.0', ['task messaging', 'connection timeout in seconds'])
u.obsolete('8.0.0', ['task messaging', 'retry interval in seconds'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'global initial scripting'])
u.obsolete('8.0.0', ['pyro', 'maximum number of ports'])
u.obsolete('8.0.0', ['execution polling intervals'])
u.obsolete('8.0.0', ['submission polling intervals'])
u.obsolete('8.0.0', ['hosts', '__MANY__', 'remote shell template'])
u.obsolete('8.0.0', ['hosts', '__MANY__', 'remote copy template'])
u.obsolete('8.0.0', ['hosts', '__MANY__', 'local tail command template'])
u.obsolete('8.0.0', ['communication', 'base port'])
u.obsolete('8.0.0', ['suite host scanning'], ['suite servers'])
u.obsolete('8.0.0', ['suite servers', 'hosts'])
u.deprecate('8.0.0',
['documentation', 'files', 'html index'],
['documentation', 'local'])
u.obsolete('7.8.1', ['documentation', 'local index'])
u.obsolete('7.8.1', ['documentation', 'files', 'pdf user guide'])
u.obsolete('7.8.1', ['documentation', 'files',
'single-page html user guide'])
u.deprecate('7.8.1',
['documentation', 'files', 'multi-page html user guide'],
['documentation', 'local'])
u.deprecate('8.0.0',
['documentation', 'files', 'html index'],
['documentation', 'local'])
u.deprecate('8.0.0',
['documentation', 'urls', 'internet homepage'],
['documentation', 'cylc homepage'])
u.obsolete('7.8.1', ['documentation', 'local index'])
u.obsolete('7.8.1', ['documentation', 'files', 'pdf user guide'])
u.obsolete('7.8.1', ['documentation', 'files',
'single-page html user guide'])

for batch_sys_name in ['loadleveler', 'lsf', 'pbs', 'sge', 'slurm']:
u.obsolete(
'8.0.0',
['test battery', 'directives', batch_sys_name + ' host'])
u.obsolete(
'8.0.0',
['test battery', 'directives', batch_sys_name + ' directives'])

for key in SPEC['cylc']['events']:
u.obsolete('8.0.0', ['cylc', 'event hooks', key])

u.upgrade()

Expand Down
27 changes: 0 additions & 27 deletions lib/cylc/cfgspec/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,33 +293,6 @@ def upg(cfg, descr):
u.obsolete('7.8.1', ['cylc', 'events', 'reset timer'])
u.obsolete('7.8.1', ['cylc', 'events', 'reset inactivity timer'])
u.obsolete('7.8.1', ['runtime', '__MANY__', 'events', 'reset timer'])
u.obsolete('8.0.0', ['scheduling', 'special tasks', 'clock-triggered'])
u.obsolete('8.0.0', ['scheduling', 'special tasks', 'external-triggered'])
u.obsolete('8.0.0', ['cylc', 'event hooks'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'event hooks'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'job submission'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'job', 'method'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'job', 'command template'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'job', 'retry delays'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'retry delays'])
u.obsolete('8.0.0', ['runtime', '__MANY__',
'submission polling intervals'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'execution polling intervals'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'title'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'description'])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'URL'])
u.obsolete('8.0.0', ['title'])
u.obsolete('8.0.0', ['description'])
u.obsolete('8.0.0', ['URL'])
u.obsolete('8.0.0', ['group'])

for old, new in [('pre-command scripting', 'pre-script'),
('command scripting', 'script'),
('post-command scripting', 'post-script'),
('environment scripting', 'env-script'),
('initial scripting', 'init-script')]:
u.obsolete('8.0.0', ['runtime', '__MANY__', old])
u.obsolete('8.0.0', ['runtime', '__MANY__', 'dummy mode', old])

u.upgrade()

Expand Down
2 changes: 1 addition & 1 deletion lib/cylc/scheduler.py
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,7 @@ def configure_reftest(self, recon=False):
def run_event_handlers(self, event, reason):
"""Run a suite event handler.
Run suite event hooks in simulation and dummy mode ONLY if enabled.
Run suite events in simulation and dummy mode ONLY if enabled.
"""
try:
if (self.run_mode in ['simulation', 'dummy'] and
Expand Down
10 changes: 7 additions & 3 deletions tests/cylc-get-cylc-version/00-basic/suite.rc
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
title = Test for the get-cylc-version command.
description = """A task compares its own cylc version to that running the
test suite (should be the same)."""
[meta]
title = Test for the get-cylc-version command.
description = """A task compares its own cylc version to that running the
test suite (should be the same)."""

[cylc]
[[reference test]]
required run mode = live
live mode suite timeout = PT30S

[scheduling]
[[dependencies]]
graph = foo

[runtime]
[[root]]
script = """
Expand Down
9 changes: 0 additions & 9 deletions tests/deprecations/00-all.t
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ cmp_ok val.out <<__END__
* (7.2.2) [cylc][simulation mode] - DELETED (OBSOLETE)
* (7.2.2) [runtime][foo, cat, dog][dummy mode] - DELETED (OBSOLETE)
* (7.2.2) [runtime][foo, cat, dog][simulation mode] - DELETED (OBSOLETE)
* (8.0.0) [scheduling][special tasks][clock-triggered] - DELETED (OBSOLETE)
* (8.0.0) [scheduling][special tasks][external-triggered] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][event hooks] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][job submission] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][retry delays] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][submission polling intervals] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][execution polling intervals] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][environment scripting] - DELETED (OBSOLETE)
* (8.0.0) [runtime][foo, cat, dog][initial scripting] - DELETED (OBSOLETE)
__END__
#-------------------------------------------------------------------------------
purge_suite $SUITE_NAME
16 changes: 0 additions & 16 deletions tests/deprecations/00-all/suite.rc
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,13 @@
[[[P1D]]]
graph = foo => cat & dog
[[special tasks]]
clock-triggered = foo(PT1M) # deprecated name
external-trigger = cat("meow available") # deprecated name
[runtime]
[[foo, cat, dog]]
initial scripting = "echo init-script" # deprecate
environment scripting = "echo env-script" # deprecate
pre-script = "echo pre-script" # deprecate
script = "echo script" # deprecate
post-script = "echo post-script" # deprecate
retry delays = 6*PT1H # deprecate
submission polling intervals = PT1H, PT2H
execution polling intervals = 10*PT30M
[[[simulation mode]]]
script = "echo script" # deprecate
[[[dummy mode]]]
script = "echo script" # deprecate
[[[job submission]]] # deprecate all these
command template = qsub something something
method = pbs
retry delays = PT1M
[[[event hooks]]]
retry handler = echo "retrying..."


[visualization]
enable live graph movie = True # obsolete
11 changes: 5 additions & 6 deletions tests/hold-release/hold-on-spawn/suite.rc
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@

title = "hold/release test suite"

description = """One task that holds then selectively releases tasks in the
first cycle point of the suite. The spawned successors to those tasks should
still be in the held state and should not run."""
[meta]
title = "hold/release test suite"
description = """One task that holds then selectively releases tasks in the
first cycle point of the suite. The spawned successors to those tasks should
still be in the held state and should not run."""

[cylc]
UTC mode = True
Expand Down

0 comments on commit d130ccd

Please sign in to comment.