explicitly allow an int where we allow a long

Author: mr-c

CommandLineTool.yml

@@ -1166,7 +1166,7 @@ $graph:
         "_id": "@type"
         "_type": "@vocab"
     - name: coresMin
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       # default: 1
       # Don't set the default here, we need to be able to distinguish between
       # a value not provided and the textual default to be able to implement
@@ -1199,14 +1199,14 @@ $graph:
         next whole number.
 
     - name: coresMax
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       doc:  |
         Maximum reserved number of CPU cores.
 
         See `coresMin` for discussion about fractional CPU requests.
 
     - name: ramMin
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       # default: 256
       # Don't set the default here, we need to be able to distinguish between
       # a value not provided and the textual default to be able to implement
@@ -1223,14 +1223,14 @@ $graph:
         non-zero integer.
 
     - name: ramMax
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       doc: |
         Maximum reserved RAM in mebibytes (2**20)
 
         See `ramMin` for discussion about fractional RAM requests.
 
     - name: tmpdirMin
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       # default: 1024
       # Don't set the default here, we need to be able to distinguish between
       # a value not provided and the textual default to be able to implement
@@ -1247,14 +1247,14 @@ $graph:
         must be a non-zero integer.
 
     - name: tmpdirMax
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       doc: |
         Maximum reserved filesystem based storage for the designated temporary directory, in mebibytes (2**20)
 
         See `tmpdirMin` for discussion about fractional storage requests.
 
     - name: outdirMin
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       # default: 1024
       # Don't set the default here, we need to be able to distinguish between
       # a value not provided and the textual default to be able to implement
@@ -1271,7 +1271,7 @@ $graph:
         must be a non-zero integer.
 
     - name: outdirMax
-      type: ["null", long, float, Expression]
+      type: ["null", int, long, float, Expression]
       doc: |
         Maximum reserved filesystem based storage for the designated output directory, in mebibytes (2**20)
 
@@ -1413,7 +1413,7 @@ $graph:
         "_id": "@type"
         "_type": "@vocab"
     - name: timelimit
-      type: [long, Expression]
+      type: [int, long, Expression]
       doc: |
         The time limit, in seconds.  A time limit of zero means no
         time limit.  Negative time limits are an error.

Process.yml

@@ -238,7 +238,10 @@ $graph:
         Optional hash code for validating file integrity.  Currently must be in the form
         "sha1$ + hexadecimal string" using the SHA-1 algorithm.
     - name: size
-      type: long?
+      type:
+        - "null"
+        - int
+        - long
       doc: Optional file size
     - name: "secondaryFiles"
       type: