Skip to content

Commit e4a31a1

Browse files
authored
Merge pull request #30 from cokelaer/main
Fix options not used in star_mapping
2 parents 8c8aa84 + 3d84d00 commit e4a31a1

File tree

5 files changed

+30
-11
lines changed

5 files changed

+30
-11
lines changed

.github/workflows/main.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
max-parallel: 5
1818
matrix:
19-
python: [3.7, 3.8, 3.9]
19+
python: [3.8, 3.9, '3.10']
2020
fail-fast: false
2121

2222

@@ -30,25 +30,28 @@ jobs:
3030
uses: actions/checkout@v2
3131

3232
- name: conda/mamba
33-
uses: mamba-org/provision-with-micromamba@main
33+
uses: mamba-org/setup-micromamba@v1
3434
with:
35+
micromamba-version: '1.3.1-0'
3536
environment-file: environment.yml
36-
extra-specs: |
37+
create-args: |
3738
python=${{ matrix.python }}
39+
cache-environment: true
40+
cache-downloads: true
3841

3942
- name: install package itself
40-
shell: bash -l {0}
43+
shell: bash -el {0}
4144
run: |
4245
pip install .
4346
4447
4548
- name: Install dependencies
46-
shell: bash -l {0}
49+
shell: bash -el {0}
4750
run: |
4851
pip install coveralls pytest-cov pytest pytest-xdist
4952
5053
- name: testing
51-
shell: bash -l {0}
54+
shell: bash -el {0}
5255
run: |
5356
pytest -v --cov-report term-missing --cov=sequana_pipelines.rnaseq
5457

README.rst

+11
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,23 @@ to be used with the pipeline. Each rule used in the pipeline may have a section
144144
.. warning:: the RNAseQC rule is switch off and is not currently functional in
145145
version 0.9.X
146146

147+
Issues
148+
~~~~~~
149+
150+
In the context of eukaryotes, you will need 32G of memory most probably. If this is too much,
151+
you can try to restrict the memory. Check out the config.yaml file in the star section.
152+
153+
154+
147155
Changelog
148156
~~~~~~~~~
149157

150158
========= ====================================================================
151159
Version Description
152160
========= ====================================================================
161+
0.17.2 * CHANGES: in star section, added --limitBAMsortRAM and set to 30G
162+
* BUG: Fix missing params (options) in star_mapping rule not taken
163+
into account
153164
0.17.1 * use new rulegraph / graphviz apptainer
154165
0.17.0 * fastp step changed to use sequana-wrappers. Slight change in
155166
config file. The reverse and forward adapter options called

sequana_pipelines/rnaseq/config.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,18 @@ bowtie1_mapping_rna:
169169
# :Parameters:
170170
#
171171
# - do: if unchecked, this rule is ignored
172-
# - options: any options recognised by rna-star tool
172+
# - options: any options recognised by rna-star tool. Set limitBAMsortRAM to 30G
173173
# - threads: number of threads to be used
174174
# - legacy: if set to True will use the old 2-pass version from STAR
175175
# used in this pipeline until v0.15.3. If you want to use the
176176
# 2-pass mode available in star, you will need star 2.7 and above
177+
#
177178
star_mapping:
178-
options: --outFilterMismatchNoverLmax 0.05 --seedSearchStartLmax 20
179+
options: " --limitBAMsortRAM 30000000000 --outFilterMismatchNoverLmax 0.05 --seedSearchStartLmax 20 "
179180
legacy: True
180181
threads: 4
181182
resources:
182-
mem: 34G
183+
mem: 32G
183184

184185
##############################################################################
185186
# STAR indexing section

sequana_pipelines/rnaseq/rnaseq.rules

+4
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,10 @@ elif manager.config.general.aligner == "star":
559559
output:
560560
bam = "{sample}/star_mapping/{sample}_Aligned.sortedByCoord.out.bam"
561561
params:
562+
options=config['star_mapping']['options'],
563+
# for legacy mapping, set the first and second pass options
564+
options_first_pass=config['star_mapping']['options'],
565+
options_second_pass=config['star_mapping']['options'],
562566
prefix = "{sample}/star_mapping/{sample}",
563567
legacy=True,
564568
threads:

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
_MAJOR = 0
77
_MINOR = 17
8-
_MICRO = 1
8+
_MICRO = 2
99
version = "%d.%d.%d" % (_MAJOR, _MINOR, _MICRO)
1010
release = "%d.%d" % (_MAJOR, _MINOR)
1111

@@ -25,9 +25,9 @@
2525
"Intended Audience :: Science/Research",
2626
"License :: OSI Approved :: BSD License",
2727
"Operating System :: OS Independent",
28-
"Programming Language :: Python :: 3.7",
2928
"Programming Language :: Python :: 3.8",
3029
"Programming Language :: Python :: 3.9",
30+
"Programming Language :: Python :: 3.10",
3131
"Topic :: Software Development :: Libraries :: Python Modules",
3232
"Topic :: Scientific/Engineering :: Bio-Informatics",
3333
"Topic :: Scientific/Engineering :: Information Analysis",

0 commit comments

Comments
 (0)