Skip to content

Commit bd00829

Browse files
Merge pull request #14 from J-81/release_NF_RCP-F_1.0.1
Release NF_RCP-F_1.0.1 from staging fork
2 parents fd43cf7 + 0c7e02b commit bd00829

File tree

5 files changed

+32
-38
lines changed

5 files changed

+32
-38
lines changed

RNAseq/Workflow_Documentation/NF_RCP-F/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [1.0.1](https://github.com/nasa/GeneLab_Data_Processing/tree/NF_RCP-F_1.0.1/RNAseq/Workflow_Documentation/NF_RCP-F) - 2022-11-17
9+
10+
### Changed
11+
12+
- Updated to dp_tools version 1.1.8 from 1.1.7: This addresses api changes from the release of the [OSDR](https://osdr.nasa.gov/bio/)
13+
14+
### Removed
15+
16+
- Docs: Recommendation to use Nextflow Version 21.10.6 removed as newer stable releases address original issue that had merited the recommendation
17+
818
## [1.0.0](https://github.com/nasa/GeneLab_Data_Processing/tree/NF_RCP-F_1.0.0/RNAseq/Workflow_Documentation/NF_RCP-F) - 2022-11-04
919

1020
### Added

RNAseq/Workflow_Documentation/NF_RCP-F/README.md

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ document](../../Pipeline_GL-DPPD-7101_Versions/GL-DPPD-7101-F.md):
6161
4b. [Approach 2: Run the workflow on a GeneLab RNAseq dataset using local Ensembl reference fasta and gtf files](#4b-approach-2-run-the-workflow-on-a-genelab-rnaseq-dataset-using-local-ensembl-reference-fasta-and-gtf-files)
6262
4c. [Approach 3: Run the workflow on a non-GLDS dataset using a user-created runsheet](#4c-approach-3-run-the-workflow-on-a-non-glds-dataset-using-a-user-created-runsheet)
6363
5. [Additional Output Files](#5-additional-output-files)
64-
6. [Known Issues to Look Out For](#6-known-issues-to-look-out-for)
6564

6665
<br>
6766

@@ -81,13 +80,6 @@ Nextflow can be installed either through [Anaconda](https://anaconda.org/biocond
8180
> conda install -c bioconda nextflow
8281
> nextflow self-update
8382
> ```
84-
85-
86-
After Nextflow is installed, run the following command to set the Nextflow version to address [known issues with the latest Nextflow versions](#6-known-issues-to-look-out-for):
87-
88-
```bash
89-
export NXF_VER=21.10.6
90-
```
9183
9284
<br>
9385
@@ -109,9 +101,9 @@ All files required for utilizing the NF_RCP-F GeneLab workflow for processing RN
109101
copy of latest NF_RCP-F version on to your system, the code can be downloaded as a zip file from the release page then unzipped after downloading by running the following commands:
110102
111103
```bash
112-
wget https://github.com/nasa/GeneLab_Data_Processing/releases/download/NF_RCP-F_1.0.0/NF_RCP-F_1.0.0.zip
104+
wget https://github.com/nasa/GeneLab_Data_Processing/releases/download/NF_RCP-F_1.0.1/NF_RCP-F_1.0.1.zip
113105
114-
unzip NF_RCP-F_1.0.0.zip
106+
unzip NF_RCP-F_1.0.1.zip
115107
```
116108
117109
<br>
@@ -123,10 +115,10 @@ unzip NF_RCP-F_1.0.0.zip
123115
Although Nextflow can fetch Singularity images from a url, doing so may cause issues as detailed [here](https://github.com/nextflow-io/nextflow/issues/1210).
124116
125117
To avoid this issue, run the following command to fetch the Singularity images prior to running the NF_RCP-F workflow:
126-
> Note: This command should be run in the location containing the `NF_RCP-F_1.0.0` directory that was downloaded in [step 2](#2-download-the-workflow-files) above. Depending on your network speed, fetching the images will take ~20 minutes.
118+
> Note: This command should be run in the location containing the `NF_RCP-F_1.0.1` directory that was downloaded in [step 2](#2-download-the-workflow-files) above. Depending on your network speed, fetching the images will take ~20 minutes.
127119
128120
```bash
129-
bash NF_RCP-F_1.0.0/bin/prepull_singularity.sh NF_RCP-F_1.0.0/config/software/by_docker_image.config
121+
bash NF_RCP-F_1.0.1/bin/prepull_singularity.sh NF_RCP-F_1.0.1/config/software/by_docker_image.config
130122
```
131123
132124
@@ -142,15 +134,15 @@ export NXF_SINGULARITY_CACHEDIR=$(pwd)/singularity
142134
143135
### 4. Run the Workflow
144136
145-
While in the location containing the `NF_RCP-F_1.0.0` directory that was downloaded in [step 2](#2-download-the-workflow-files), you are now able to run the workflow. Below are three examples of how to run the NF_RCP-F workflow:
137+
While in the location containing the `NF_RCP-F_1.0.1` directory that was downloaded in [step 2](#2-download-the-workflow-files), you are now able to run the workflow. Below are three examples of how to run the NF_RCP-F workflow:
146138
> Note: Nextflow commands use both single hyphen arguments (e.g. -help) that denote general nextflow arguments and double hyphen arguments (e.g. --ensemblVersion) that denote workflow specific parameters. Take care to use the proper number of hyphens for each argument.
147139
148140
<br>
149141
150142
#### 4a. Approach 1: Run the workflow on a GeneLab RNAseq dataset with automatic retrieval of Ensembl reference fasta and gtf files
151143
152144
```bash
153-
nextflow run NF_RCP-F_1.0.0/main.nf \
145+
nextflow run NF_RCP-F_1.0.1/main.nf \
154146
-profile singularity \
155147
--gldsAccession GLDS-194
156148
```
@@ -160,7 +152,7 @@ nextflow run NF_RCP-F_1.0.0/main.nf \
160152
#### 4b. Approach 2: Run the workflow on a GeneLab RNAseq dataset using local Ensembl reference fasta and gtf files
161153
162154
```bash
163-
nextflow run NF_RCP-F_1.0.0/main.nf \
155+
nextflow run NF_RCP-F_1.0.1/main.nf \
164156
-profile singularity \
165157
--gldsAccession GLDS-194 \
166158
--ensemblVersion 107 \
@@ -176,7 +168,7 @@ nextflow run NF_RCP-F_1.0.0/main.nf \
176168
> Note: Specifications for creating a runsheet manually are described [here](examples/runsheet/README.md).
177169
178170
```bash
179-
nextflow run NF_RCP-F_1.0.0/main.nf \
171+
nextflow run NF_RCP-F_1.0.1/main.nf \
180172
-profile singularity \
181173
--runsheetPath </path/to/runsheet>
182174
```
@@ -185,7 +177,7 @@ nextflow run NF_RCP-F_1.0.0/main.nf \
185177
186178
**Required Parameters For All Approaches:**
187179
188-
* `NF_RCP-F_1.0.0/main.nf` - Instructs Nextflow to run the NF_RCP-F workflow
180+
* `NF_RCP-F_1.0.1/main.nf` - Instructs Nextflow to run the NF_RCP-F workflow
189181
190182
* `-profile` - Specifies the configuration profile(s) to load, `singularity` instructs Nextflow to setup and use singularity for all software called in the workflow
191183
@@ -231,7 +223,7 @@ nextflow run NF_RCP-F_1.0.0/main.nf \
231223
All parameters listed above and additional optional arguments for the RCP workflow, including debug related options that may not be immediately useful for most users, can be viewed by running the following command:
232224
233225
```bash
234-
nextflow run NF_RCP-F_1.0.0/main.nf --help
226+
nextflow run NF_RCP-F_1.0.1/main.nf --help
235227
```
236228
237229
See `nextflow run -h` and [Nextflow's CLI run command documentation](https://nextflow.io/docs/latest/cli.html#run) for more options and details common to all nextflow workflows.
@@ -279,13 +271,3 @@ Standard Nextflow resource usage logs are also produced as follows:
279271
280272
<br>
281273
282-
---
283-
284-
### 6. Known Issues to Look Out For
285-
286-
**Recent Nextflow versions introduced a bug that causes the workflow to fail during retrieval of files from the GeneLab Repository.**
287-
288-
- [Nextflow Issue 2918 Link](https://github.com/nextflow-io/nextflow/issues/2918)
289-
- This will be fixed in an upcoming release of Nextflow. In the meantime, the workflow should work with Nextflow Version 21.10.6, which predates the introduction of the bug.
290-
- We recommend setting the environment variable 'NXF_VER=21.10.6' to allow Nextflow to automatically update/downgrade to that version on launch.
291-

RNAseq/Workflow_Documentation/NF_RCP-F/workflow_code/config/software/by_docker_image.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ process {
4444
}
4545

4646
withName: 'RNASEQ_RUNSHEET_FROM_GLDS|GENERATE_MD5SUMS|UPDATE_ISA_TABLES|SOFTWARE_VERSIONS' {
47-
container = "quay.io/j_81/dp_tools:1.1.7"
47+
container = "quay.io/j_81/dp_tools:1.1.8"
4848
}
4949

5050
withLabel: 'VV' {
51-
container = "quay.io/j_81/dp_tools:1.1.7"
51+
container = "quay.io/j_81/dp_tools:1.1.8"
5252
}
5353

5454
withName: 'GET_MAX_READ_LENGTH|ASSESS_STRANDEDNESS' {

RNAseq/Workflow_Documentation/NF_RCP-F/workflow_code/nextflow.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ manifest {
7474
description = 'RNA-Seq Pipeline for Document GL-DPPD-7101-F'
7575
mainScript = 'main.nf'
7676
defaultBranch = 'main'
77-
nextflowVersion = '>=21.04.1'
78-
version = '1.0.0'
77+
nextflowVersion = '>=22.10.1'
78+
version = '1.0.1'
7979
}
8080

8181
// Adapted from : https://github.com/nf-core/rnaseq/blob/master/nextflow.config
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
# GeneLab RNAseq Workflow Information
22

3-
> **Starting with version F of the GeneLab RNA sequence consensus processing pipeline (RCP),
4-
[`GL-DPPD-7101-F.md`](../Pipeline_GL-DPPD-7101_Versions/GL-DPPD-7101-F.md),
3+
> **Starting with version F of the GeneLab RNA-seq consensus processing pipeline (RCP),
4+
[`GL-DPPD-7101-F.md`](../Pipeline_GL-DPPD-7101_Versions/GL-DPPD-7101-F.md),
55
GeneLab has wrapped each step of the pipeline into a workflow with validation and verification of output files built in after each step. The table below lists (and links to) each RCP version and the corresponding workflow subdirectory, the current RCP/workflow implementation is indicated. Each workflow subdirectory contains information about the workflow along with instructions for installation and usage. Exact workflow run info and RCP version used to process specific datasets that have been released are available in the [GLDS_Processing_Scripts](../GLDS_Processing_Scripts) directory.**
66

77
## RCP Version and Corresponding Workflow
88

9-
|RCP Version|Workflow|
10-
|:----------|:-------|
11-
|*[GL-DPPD-7101-F.md](../Pipeline_GL-DPPD-7101_Versions/GL-DPPD-7101-F.md)|[NF_RCP-F](NF_RCP-F)|
9+
|Pipeline Version|Current Workflow Version (for respective pipeline version)|
10+
|:---------------|:---------------------------------------------------------|
11+
|*[GL-DPPD-7101-F.md](../Pipeline_GL-DPPD-7101_Versions/GL-DPPD-7101-F.md)|[1.0.1](NF_RCP-F)|
1212

13-
*Current GeneLab RCP version/workflow implementation
13+
*Current GeneLab Pipeline/Workflow Implementation
14+
15+
> See the [workflow change log](NF_RCP-F/CHANGELOG.md) to access previous workflow versions and view all changes associated with each version update.

0 commit comments

Comments
 (0)