Skip to content

Commit c880170

Browse files
author
Tobias Hofmann
committed
fixed biopython deprecation warning
1 parent 0e24543 commit c880170

File tree

9 files changed

+64
-12
lines changed

9 files changed

+64
-12
lines changed

build/lib/secapr/_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
version_json = '''
1010
{
11-
"date": "2020-09-03T08:40:33+0200",
11+
"date": "2020-09-03T14:47:02+0200",
1212
"dirty": true,
1313
"error": null,
14-
"full-revisionid": "6c64e8334194adde121523290caf950c97360619",
15-
"version": "1.1.12+43.g6c64e83.dirty"
14+
"full-revisionid": "0e245431fefa2d8aab32a86e62516b151dee55e4",
15+
"version": "1.1.12+44.g0e24543.dirty"
1616
}
1717
''' # END VERSION_JSON
1818

build/lib/secapr/align_sequences.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ def create_locus_specific_fasta(sequences):
164164
#fd, fasta_file = tempfile.mkstemp()
165165
handle = open(fasta_file,'w')
166166
for seq in sequences:
167-
handle.write(seq.format("fasta"))
167+
seq.id = '_'.join(seq.id.split('_')[1:])
168+
handle.write(format(seq,"fasta"))
168169
return fasta_file
169170

170171

build/lib/secapr/helpers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,17 @@ def get_alignment_files(log, input_dir, input_format):
274274
return alignments
275275

276276

277-
def write_alignments_to_outdir(log, outdir, alignments, format):
277+
def write_alignments_to_outdir(log, outdir, alignments, alformat):
278278
log.info('Writing output files')
279279
for tup in alignments:
280280
locus, aln = tup
281281
if aln.trimmed is not None:
282282
outname = "{}{}".format(
283283
os.path.join(outdir, locus),
284-
get_file_extensions(format)[0]
284+
get_file_extensions(alformat)[0]
285285
)
286286
with open(outname, 'w') as outf:
287-
outf.write(aln.trimmed.format(format))
287+
outf.write(format(aln.trimmed,alformat))
288288
else:
289289
log.warn("DROPPED {0} from output".format(locus))
290290

166 KB
Binary file not shown.
166 KB
Binary file not shown.

recipe/meta.yaml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{% set version = "1.1.15" %}
2+
3+
package:
4+
name: secapr
5+
version: {{ version }}
6+
7+
source:
8+
url: https://github.com/AntonelliLab/seqcap_processor/archive/v{{ version }}.tar.gz
9+
sha256: 0bf985591b8c44f69ca1d4c40d0d37c871d914336d1846a70cad209fcab529c1
10+
11+
build:
12+
skip: True # [not py27]
13+
number: 0
14+
script: python -m pip install --no-deps --ignore-installed .
15+
entry_points:
16+
- secapr = secapr.__main__:main
17+
18+
requirements:
19+
host:
20+
- python
21+
- pip
22+
- setuptools
23+
24+
run:
25+
- python
26+
- pandas
27+
- matplotlib
28+
- biopython
29+
- trimmomatic
30+
- fastqc
31+
- abyss
32+
- spades
33+
- blast
34+
- mafft
35+
- muscle
36+
- emboss
37+
- bwa
38+
- samtools
39+
40+
test:
41+
imports:
42+
- secapr
43+
commands:
44+
- secapr --version
45+
46+
about:
47+
home: 'https://github.com/AntonelliLab/seqcap_processor'
48+
license: MIT
49+
license_file: LICENSE
50+
summary: 'Process sequence-capture FASTQ files into alignments for phylogenetic analyses. Integrates allele phasing, producing haplotype alignments.'

secapr.egg-info/PKG-INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 1.1
22
Name: secapr
3-
Version: 1.1.12+43.g6c64e83.dirty
3+
Version: 1.1.12+44.g0e24543.dirty
44
Summary: Process sequence-capture fastq files into alignments for phylogenetic analyses
55
Home-page: https://github.com/AntonelliLab/seqcap_processor
66
Author: Tobias Andermann

secapr/align_sequences.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ def create_locus_specific_fasta(sequences):
164164
#fd, fasta_file = tempfile.mkstemp()
165165
handle = open(fasta_file,'w')
166166
for seq in sequences:
167-
handle.write(seq.format("fasta"))
167+
seq.id = '_'.join(seq.id.split('_')[1:])
168+
handle.write(format(seq,"fasta"))
168169
return fasta_file
169170

170171

secapr/helpers.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,17 +274,17 @@ def get_alignment_files(log, input_dir, input_format):
274274
return alignments
275275

276276

277-
def write_alignments_to_outdir(log, outdir, alignments, format):
277+
def write_alignments_to_outdir(log, outdir, alignments, alformat):
278278
log.info('Writing output files')
279279
for tup in alignments:
280280
locus, aln = tup
281281
if aln.trimmed is not None:
282282
outname = "{}{}".format(
283283
os.path.join(outdir, locus),
284-
get_file_extensions(format)[0]
284+
get_file_extensions(alformat)[0]
285285
)
286286
with open(outname, 'w') as outf:
287-
outf.write(aln.trimmed.format(format))
287+
outf.write(format(aln.trimmed,alformat))
288288
else:
289289
log.warn("DROPPED {0} from output".format(locus))
290290

0 commit comments

Comments
 (0)