Merge branch 'release/1.2.0'

msk-access · Nov 23, 2021 · e55c072 · e55c072
2 parents c9bcc41 + 06767e6
commit e55c072
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/command_line_tools b/command_line_tools
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.0
+current_version = 1.2.0
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
@@ -36,6 +36,6 @@
     test_suite='tests',
     tests_require=test_requirements,
     url='https://github.com/msk-access/uncollapsed_bam_generation',
-    version='1.1.0',
+    version='1.2.0',
     zip_safe=False,
 )
diff --git a/uncollapsed_bam_generation.cwl b/uncollapsed_bam_generation.cwl
@@ -449,10 +449,18 @@ inputs:
     type: string?
     'sbg:x': 0
     'sbg:y': 3310.703125
-  - id: maximum_read_length
+  - id: fastp_maximum_read_length
     type: int?
     'sbg:x': 0
     'sbg:y': 2135.9375
+  - id: fastp_max_len_read1
+    type: int?
+    'sbg:x': 1773.6907958984375
+    'sbg:y': 3302.252197265625
+  - id: fastp_max_len_read2
+    type: int?
+    'sbg:x': 1686.5479736328125
+    'sbg:y': 3223.680908203125
 outputs:
   - id: gatk_sam_to_fastq_unpaired_fastq
     outputSource:
@@ -600,7 +608,11 @@ steps:
       - id: minimum_read_length
         source: fastp_minimum_read_length
       - id: maximum_read_length
-        source: maximum_read_length
+        source: fastp_maximum_read_length
+      - id: max_len_read1
+        source: fastp_max_len_read1
+      - id: max_len_read2
+        source: fastp_max_len_read2
       - id: json_output_path
         source: fastp_json_output_file_name
       - id: html_output_path
+1 −1		cwl_commandlinetools/__init__.py
+20 −2		fastp_0.20.1/fastp_0.20.1.cwl
+1 −1		setup.cfg
+1 −1		setup.py