Skip to content

Commit

Permalink
Restrict vsearch, fix coverage, make numpy constraint concordant with…
Browse files Browse the repository at this point in the history
… skbio (#187)

* Restrict vsearch, fix coverage, make numpy constraint concordant with skbio

* Version pin on numpy seemed to do it, verifying, and isolating to a specific test that was failing to reduce iteration time

* Actually isolate

* Better investigation of tmp

* Missing do

* Enumerate binaries from bioconda

* test vsearch 2.8.3

* Force libgcc:

* libgcc did it, remove, check vsearch

* Readd libgcc to see how linking changes

* libgcc is not the magic

* Print the correct thing

* kick travis

* to 2.7.0

* add dmesg

* Now try vsearch < 2.7.0

* under 2.6.0

* add replication script

* p3.5 & vsearch2.7.0

* cleaning changes

* adding python3.6
  • Loading branch information
wasade authored Sep 14, 2018
1 parent 25ac7de commit b9f2a7d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: python
env:
- PYTHON_VERSION=3.5
- PYTHON_VERSION=3.6
before_install:
- wget http://repo.continuum.io/miniconda/Miniconda3-3.7.3-Linux-x86_64.sh -O miniconda.sh
- chmod +x miniconda.sh
Expand All @@ -11,11 +12,11 @@ before_install:
install:
- conda create --yes -n deblur python=$PYTHON_VERSION pip nose flake8 h5py
- source activate deblur
- conda install --yes -c bioconda "VSEARCH>=2.0.3" MAFFT=7.310 SortMeRNA=2.0
- conda install --yes -c bioconda "VSEARCH=2.7.0" MAFFT=7.310 SortMeRNA=2.0
- pip install -U pip coveralls
- pip install --process-dependency-links .
script:
- nosetests --with-doctest --with-coverage
- nosetests --with-doctest --with-coverage --cover-package=deblur
- flake8 --max-line-length=200 deblur scripts/deblur setup.py
after_success:
- coveralls
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ source activate deblurenv

Install Deblur dependencies and Deblur itself:
```
conda install -c bioconda -c biocore VSEARCH MAFFT=7.310 biom-format SortMeRNA==2.0 deblur
conda install -c bioconda -c biocore "VSEARCH=2.7.0" MAFFT=7.310 SortMeRNA=2.0 biom-format deblur
```

N.B. Some dependencies are version restricted at the moment but for different reasons. SortMeRNA 2.1 has a different output format which Deblur is not compatible with yet. A review of the changelog did not reveal any remarkable notes (e.g., bugs) about the reasons for the differences. In testing, the differences affected <0.1% of the sOTUs. As a precaution, we are advising the use of these specific versions for consistency with the manuscript.
Expand All @@ -38,7 +38,7 @@ If you are running Deblur directly, we recommend focusing on the `workflow` subc
deblur workflow --help
```

As a simple example, let's specify an input FASTA file, an output path and a sequence trim length of 150. This command will trim all sequences in `all_samples.fna` to 150nt in length; any read that is shorter will be omitted. This execution mode assumes that `all_samples.fna` is demultiplexed such that the sequence IDs are compatible with QIIME 1.9.1. On completion, a new directory `output` will be created with multiple output files (see the Input and Output Files section for more detail).
As a simple example, let's specify an input FASTA file, an output path and a sequence trim length of 150. This command will trim all sequences in `all_samples.fna` to 150nt in length; any read that is shorter will be omitted. This execution mode assumes that `all_samples.fna` is demultiplexed such that the sequence IDs are compatible with QIIME 1.9.1. On completion, a new directory `output` will be created with multiple output files (see the Input and Output Files section for more detail).

```
deblur workflow --seqs-fp all_samples.fna --output-dir output -t 150
Expand Down Expand Up @@ -74,7 +74,7 @@ Important options

Deblur cannot associate sequences with different lengths. As such, trimming reads is a required first step in the Deblur pipeline. The sequence trim length is specified by the ```-t NNN``` flag, where NNN denotes the length all sequences will be trimmed to. All reads shorter than this length will be discarded. If the input data are known to have a common length, it is possible to disable trimming by specifying a trim value of `-1`.

Deblur can operate in parallel. The number of threads can be specified by the ```-O NNN``` flag (default it 1). Running more threads than available cores is not advised.
Deblur can operate in parallel. The number of threads can be specified by the ```-O NNN``` flag (default it 1). Running more threads than available cores is not advised.

Positive and Negative Filtering
===============================
Expand Down
1 change: 1 addition & 0 deletions deblur/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -961,4 +961,5 @@ def _system_call(cmd, stdoutfilename=None):
# This call blocks until the command is done
stdout, stderr = proc.communicate()
return_value = proc.returncode

return stdout, stderr, return_value

0 comments on commit b9f2a7d

Please sign in to comment.