[svn-genapp] r1710 - in tutorial2: bin modules

svn@...
 

Author: ehb
Date: Sun Sep 22 11:04:07 2019
New Revision: 1710

Log:
Updates for container tutorial

Modified:
tutorial2/bin/repeater.py
tutorial2/modules/calculate.json
tutorial2/modules/energy.json
tutorial2/modules/message.json
tutorial2/modules/pdbviewer.json
tutorial2/modules/plotly.json
tutorial2/modules/repeater.json

Modified: tutorial2/bin/repeater.py
==============================================================================
--- tutorial2/bin/repeater.py Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/bin/repeater.py Sun Sep 22 11:04:07 2019 (r1710)
@@ -10,13 +10,7 @@

if isinstance( json_variables, dict ) and \
'm' in json_variables and \
- 'c' in json_variables and \
- ( isinstance( json_variables[ 'm' ], int ) or \
- isinstance( json_variables[ 'm' ], float ) or \
- isinstance( json_variables[ 'm' ], str ) ) and \
- ( isinstance( json_variables[ 'c' ], int ) or \
- isinstance( json_variables[ 'c' ], float ) or \
- isinstance( json_variables[ 'c' ], str ) ) :
+ 'c' in json_variables :
mass = float(json_variables['m'])
speed_of_light = float(json_variables['c'])


Modified: tutorial2/modules/calculate.json
==============================================================================
--- tutorial2/modules/calculate.json Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/modules/calculate.json Sun Sep 22 11:04:07 2019 (r1710)
@@ -2,6 +2,14 @@
"moduleid" : "calculate"
,"label" : "Calculated Fields Exercise"
,"executable" : "calculate.py"
+# ,"resource" : "docker-local"
+ ,"dependencies" : [
+ { "base" : "python" }
+ ,{ "file" : "mass_energy.py" }
+# comment above line and uncomment 2 lines below for perl executable
+# { "base" : "perl" }
+# ,{ "cpan" : "JSON" }
+ ]
,"fields" : [
{
"role" : "input"

Modified: tutorial2/modules/energy.json
==============================================================================
--- tutorial2/modules/energy.json Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/modules/energy.json Sun Sep 22 11:04:07 2019 (r1710)
@@ -3,6 +3,14 @@
,"label" : "Energy"
,"help" : "help for Energy"
,"executable" : "energy.py"
+# ,"resource" : "docker-local"
+ ,"dependencies" : [
+ { "base" : "python" }
+ ,{ "file" : "mass_energy.py" }
+# comment above 2 lines and uncomment 2 lines below for perl executable
+# { "base" : "perl" }
+# ,{ "cpan" : "JSON" }
+ ]
,"fields" : [
{
"role" : "input"

Modified: tutorial2/modules/message.json
==============================================================================
--- tutorial2/modules/message.json Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/modules/message.json Sun Sep 22 11:04:07 2019 (r1710)
@@ -3,6 +3,13 @@
,"label" : "Message"
,"help" : "help for Message"
,"executable" : "message.py"
+# ,"resource" : "docker-local"
+ ,"dependencies" : [
+ { "base" : "python" }
+# comment above line and uncomment 2 lines below for python executable
+# { "base" : "perl" }
+# ,{ "cpan" : "JSON" }
+ ]
,"fields" : [
{
"role" : "input"

Modified: tutorial2/modules/pdbviewer.json
==============================================================================
--- tutorial2/modules/pdbviewer.json Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/modules/pdbviewer.json Sun Sep 22 11:04:07 2019 (r1710)
@@ -3,6 +3,11 @@
,"label" : "Pdbviewer"
,"help" : "help for Pdbviewer"
,"executable" : "pdbviewer.pl"
+# ,"resource" : "docker-local"
+ ,"dependencies" : [
+ { "base" : "perl" }
+ ,{ "cpan" : "JSON" }
+ ]
,"fields" : [
{
"role" : "input"

Modified: tutorial2/modules/plotly.json
==============================================================================
--- tutorial2/modules/plotly.json Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/modules/plotly.json Sun Sep 22 11:04:07 2019 (r1710)
@@ -3,6 +3,13 @@
,"label" : "Plotly"
,"help" : "help for Plotly"
,"executable" : "plotly.py"
+# ,"resource" : "docker-local"
+ ,"dependencies" : [
+ { "base" : "python" }
+# comment above line and uncomment 2 lines below for python executable
+# { "base" : "perl" }
+# ,{ "cpan" : "JSON" }
+ ]
,"fields" : [
{
"role" : "input"

Modified: tutorial2/modules/repeater.json
==============================================================================
--- tutorial2/modules/repeater.json Sun Sep 22 09:55:25 2019 (r1709)
+++ tutorial2/modules/repeater.json Sun Sep 22 11:04:07 2019 (r1710)
@@ -3,6 +3,14 @@
,"label" : "Repeater"
,"help" : "help for Repeater"
,"executable" : "repeater.py"
+# ,"resource" : "docker-local"
+ ,"dependencies" : [
+ { "base" : "python" }
+ ,{ "file" : "mass_energy.py" }
+# comment above 2 lines and uncomment 2 lines below for perl executable
+# { "base" : "perl" }
+# ,{ "cpan" : "JSON" }
+ ]
,"fields" : [
{
"role" : "input"

Join genapp-commits@groups.io to automatically receive all group messages.