annotate tools/mira3/mira.py @ 24:ad14a345f1b0 draft

planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit 6405ba93fcec7ea93452bf54d559c7507ee7a57c
author peterjc
date Wed, 07 Jun 2017 12:33:07 -0400
parents 83a94a5038a7
children 85b86f31327c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
1 #!/usr/bin/env python
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
2 """A simple wrapper script to call MIRA and collect its output.
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
3 """
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
4
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
5 from __future__ import print_function
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
6
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
7 import os
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
8 import shutil
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
9 import subprocess
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
10 import sys
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
11 import time
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
12
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
13 WRAPPER_VER = "0.0.12" # Keep in sync with the XML file
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
14
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
15
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
16 def get_version():
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
17 """Run MIRA to find its version number"""
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
18 # At the commend line I would use: mira -v | head -n 1
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
19 # however there is some pipe error when doing that here.
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
20 cmd = ["mira", "-v"]
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
21 try:
24
ad14a345f1b0 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit 6405ba93fcec7ea93452bf54d559c7507ee7a57c
peterjc
parents: 23
diff changeset
22 child = subprocess.Popen(cmd, universal_newlines=True,
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
23 stdout=subprocess.PIPE,
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
24 stderr=subprocess.STDOUT)
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
25 except Exception as err:
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
26 sys.stderr.write("Error invoking command:\n%s\n\n%s\n" % (" ".join(cmd), err))
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
27 sys.exit(1)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
28 ver, tmp = child.communicate()
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
29 del child
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
30 return ver.split("\n", 1)[0]
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
31
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
32
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
33 mira_ver = get_version()
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
34 if "V3.4." not in mira_ver:
22
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
35 sys.exit("This wrapper is for MIRA V3.4, not %s" % mira_ver)
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
36 if "-v" in sys.argv:
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
37 print("MIRA wrapper version %s," % WRAPPER_VER)
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
38 print(mira_ver)
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
39 sys.exit(0)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
40
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
41
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
42 def collect_output(temp, name):
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
43 f = "%s/%s_assembly/%s_d_results" % (temp, name, name)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
44 if not os.path.isdir(f):
22
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
45 sys.exit("Missing output folder")
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
46 if not os.listdir(f):
22
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
47 sys.exit("Empty output folder")
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
48 missing = []
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
49 for old, new in [("%s/%s_out.unpadded.fasta" % (f, name), out_fasta),
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
50 ("%s/%s_out.unpadded.fasta.qual" % (f, name), out_qual),
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
51 ("%s/%s_out.wig" % (f, name), out_wig),
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
52 ("%s/%s_out.caf" % (f, name), out_caf),
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
53 ("%s/%s_out.ace" % (f, name), out_ace)]:
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
54 if not os.path.isfile(old):
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
55 missing.append(os.path.splitext(old)[-1])
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
56 else:
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
57 shutil.move(old, new)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
58 if missing:
22
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
59 sys.exit("Missing output files: %s" % ", ".join(missing))
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
60
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
61
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
62 def clean_up(temp, name):
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
63 folder = "%s/%s_assembly" % (temp, name)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
64 if os.path.isdir(folder):
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
65 shutil.rmtree(folder)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
66
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
67
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
68 # TODO - Run MIRA in /tmp or a configurable directory?
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
69 # Currently Galaxy puts us somewhere safe like:
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
70 # /opt/galaxy-dist/database/job_working_directory/846/
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
71 temp = "."
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
72 name, out_fasta, out_qual, out_ace, out_caf, out_wig, out_log = sys.argv[1:8]
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
73
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
74 start_time = time.time()
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
75 cmd_list = sys.argv[8:]
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
76 cmd = " ".join(cmd_list)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
77
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
78 assert os.path.isdir(temp)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
79 d = "%s_assembly" % name
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
80 assert not os.path.isdir(d), "Path %s already exists" % d
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
81 try:
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
82 # Check path access
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
83 os.mkdir(d)
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
84 except Exception as err:
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
85 sys.stderr.write("Error making directory %s\n%s" % (d, err))
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
86 sys.exit(1)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
87
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
88 # print(os.path.abspath("."))
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
89 # print(cmd)
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
90
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
91 handle = open(out_log, "w")
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
92 try:
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
93 # Run MIRA
24
ad14a345f1b0 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit 6405ba93fcec7ea93452bf54d559c7507ee7a57c
peterjc
parents: 23
diff changeset
94 child = subprocess.Popen(cmd_list, universal_newlines=True,
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
95 stdout=handle,
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
96 stderr=subprocess.STDOUT)
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
97 except Exception as err:
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
98 sys.stderr.write("Error invoking command:\n%s\n\n%s\n" % (cmd, err))
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
99 # TODO - call clean up?
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
100 handle.write("Error invoking command:\n%s\n\n%s\n" % (cmd, err))
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
101 handle.close()
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
102 sys.exit(1)
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
103 # Use .communicate as can get deadlocks with .wait(),
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
104 stdout, stderr = child.communicate()
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
105 assert not stdout and not stderr # Should be empty as sent to handle
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
106 run_time = time.time() - start_time
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
107 return_code = child.returncode
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
108 handle.write("\n\nMIRA took %0.2f minutes\n" % (run_time / 60.0))
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
109 print("MIRA took %0.2f minutes" % (run_time / 60.0))
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
110 if return_code:
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
111 handle.write("Return error code %i from command:\n" % return_code)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
112 handle.write(cmd + "\n")
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
113 handle.close()
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
114 clean_up(temp, name)
22
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
115 sys.stderr.write("Return error code %i from command:\n" % return_code)
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
116 sys.stderr.write(cmd + "\n")
a5a3460fafa6 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit bc3d484c5cd68ddcf456db2fff489d584aa2034c
peterjc
parents: 16
diff changeset
117 sys.exit(return_code)
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
118 handle.close()
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
119
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
120 # print "Collecting output..."
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
121 collect_output(temp, name)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
122
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
123 # print "Cleaning up..."
12
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
124 clean_up(temp, name)
5b0af75dfe5a Uploaded v0.0.9, correct path in dependency installation; renamed folder
peterjc
parents:
diff changeset
125
23
83a94a5038a7 planemo upload for repository https://github.com/peterjc/galaxy_mira/tree/master/tools/mira3/ commit fd979d17340cde155de176604744831d9597c6b6
peterjc
parents: 22
diff changeset
126 print("Done")