1 |
commit: 031391850b6768a55ed2c98a93eeb255954b51d2 |
2 |
Author: Martin Mokrejš <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
3 |
AuthorDate: Sun Mar 23 16:07:50 2014 +0000 |
4 |
Commit: Martin Mokrejs <mmokrejs <AT> fold <DOT> natur <DOT> cuni <DOT> cz> |
5 |
CommitDate: Sun Mar 23 16:07:50 2014 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=03139185 |
7 |
|
8 |
sci-biology/biopython-1.63-r1: added missing deps on dev-python/rdflib to sync with official sci-biology/biopython-1.63; dropping sci-biology/biopython-1.63 from overlay |
9 |
|
10 |
Package-Manager: portage-2.2.7 |
11 |
|
12 |
--- |
13 |
sci-biology/biopython/ChangeLog | 8 ++ |
14 |
sci-biology/biopython/biopython-1.62-r3.ebuild | 51 ------- |
15 |
sci-biology/biopython/biopython-1.62-r4.ebuild | 51 ------- |
16 |
sci-biology/biopython/biopython-1.63-r1.ebuild | 1 + |
17 |
sci-biology/biopython/biopython-1.63.ebuild | 50 ------- |
18 |
sci-biology/biopython/files/SeqRecord.py.patch | 148 --------------------- |
19 |
.../biopython/files/adjust-trimpoints.patch | 76 ----------- |
20 |
7 files changed, 9 insertions(+), 376 deletions(-) |
21 |
|
22 |
diff --git a/sci-biology/biopython/ChangeLog b/sci-biology/biopython/ChangeLog |
23 |
index 6dfe5e2..037227d 100644 |
24 |
--- a/sci-biology/biopython/ChangeLog |
25 |
+++ b/sci-biology/biopython/ChangeLog |
26 |
@@ -2,6 +2,14 @@ |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
# $Header: $ |
29 |
|
30 |
+ 23 Mar 2014; Martin Mokrejs <mmokrejs@×××××××××××××××.cz> |
31 |
+ -biopython-1.62-r3.ebuild, -biopython-1.62-r4.ebuild, -biopython-1.63.ebuild, |
32 |
+ -files/SeqRecord.py.patch, -files/adjust-trimpoints.patch, |
33 |
+ biopython-1.63-r1.ebuild: |
34 |
+ sci-biology/biopython-1.63-r1: added missing deps on dev-python/rdflib to sync |
35 |
+ with official sci-biology/biopython-1.63; dropping sci-biology/biopython-1.63 |
36 |
+ from overlay |
37 |
+ |
38 |
*biopython-1.62-r3 (23 Mar 2014) |
39 |
*biopython-1.62-r4 (23 Mar 2014) |
40 |
*biopython-1.63-r1 (23 Mar 2014) |
41 |
|
42 |
diff --git a/sci-biology/biopython/biopython-1.62-r3.ebuild b/sci-biology/biopython/biopython-1.62-r3.ebuild |
43 |
deleted file mode 100644 |
44 |
index 1eed5a9..0000000 |
45 |
--- a/sci-biology/biopython/biopython-1.62-r3.ebuild |
46 |
+++ /dev/null |
47 |
@@ -1,51 +0,0 @@ |
48 |
-# Copyright 1999-2014 Gentoo Foundation |
49 |
-# Distributed under the terms of the GNU General Public License v2 |
50 |
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.62.ebuild,v 1.1 2013/09/17 16:07:56 jlec Exp $ |
51 |
- |
52 |
-EAPI=5 |
53 |
- |
54 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
55 |
- |
56 |
-inherit distutils-r1 eutils |
57 |
- |
58 |
-DESCRIPTION="Python modules for computational molecular biology" |
59 |
-HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/" |
60 |
-SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz" |
61 |
- |
62 |
-LICENSE="HPND" |
63 |
-SLOT="0" |
64 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
65 |
-IUSE="mysql postgres" |
66 |
- |
67 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
68 |
- |
69 |
-RDEPEND="${PYTHON_DEPS} |
70 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
71 |
- dev-python/networkx[${PYTHON_USEDEP}] |
72 |
- dev-python/numpy[${PYTHON_USEDEP}] |
73 |
- dev-python/pygraphviz[${PYTHON_USEDEP}] |
74 |
- dev-python/reportlab[${PYTHON_USEDEP}] |
75 |
- media-gfx/pydot[${PYTHON_USEDEP}] |
76 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
77 |
- postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )" |
78 |
-DEPEND="${RDEPEND} |
79 |
- sys-devel/flex" |
80 |
- |
81 |
-DOCS=( CONTRIB DEPRECATED NEWS README Doc/. ) |
82 |
- |
83 |
-src_prepare() { |
84 |
- distutils-r1_src_prepare |
85 |
- epatch "${FILESDIR}/${PN}-1.62-SffIO.patch" |
86 |
-} |
87 |
- |
88 |
-python_test() { |
89 |
- cd Tests || die |
90 |
- ${PYTHON} run_tests.py || die |
91 |
-} |
92 |
- |
93 |
-python_install_all() { |
94 |
- distutils-r1_python_install_all |
95 |
- |
96 |
- dodir /usr/share/${PN} |
97 |
- cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die |
98 |
-} |
99 |
|
100 |
diff --git a/sci-biology/biopython/biopython-1.62-r4.ebuild b/sci-biology/biopython/biopython-1.62-r4.ebuild |
101 |
deleted file mode 100644 |
102 |
index 1eed5a9..0000000 |
103 |
--- a/sci-biology/biopython/biopython-1.62-r4.ebuild |
104 |
+++ /dev/null |
105 |
@@ -1,51 +0,0 @@ |
106 |
-# Copyright 1999-2014 Gentoo Foundation |
107 |
-# Distributed under the terms of the GNU General Public License v2 |
108 |
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.62.ebuild,v 1.1 2013/09/17 16:07:56 jlec Exp $ |
109 |
- |
110 |
-EAPI=5 |
111 |
- |
112 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
113 |
- |
114 |
-inherit distutils-r1 eutils |
115 |
- |
116 |
-DESCRIPTION="Python modules for computational molecular biology" |
117 |
-HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/" |
118 |
-SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz" |
119 |
- |
120 |
-LICENSE="HPND" |
121 |
-SLOT="0" |
122 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
123 |
-IUSE="mysql postgres" |
124 |
- |
125 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
126 |
- |
127 |
-RDEPEND="${PYTHON_DEPS} |
128 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
129 |
- dev-python/networkx[${PYTHON_USEDEP}] |
130 |
- dev-python/numpy[${PYTHON_USEDEP}] |
131 |
- dev-python/pygraphviz[${PYTHON_USEDEP}] |
132 |
- dev-python/reportlab[${PYTHON_USEDEP}] |
133 |
- media-gfx/pydot[${PYTHON_USEDEP}] |
134 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
135 |
- postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )" |
136 |
-DEPEND="${RDEPEND} |
137 |
- sys-devel/flex" |
138 |
- |
139 |
-DOCS=( CONTRIB DEPRECATED NEWS README Doc/. ) |
140 |
- |
141 |
-src_prepare() { |
142 |
- distutils-r1_src_prepare |
143 |
- epatch "${FILESDIR}/${PN}-1.62-SffIO.patch" |
144 |
-} |
145 |
- |
146 |
-python_test() { |
147 |
- cd Tests || die |
148 |
- ${PYTHON} run_tests.py || die |
149 |
-} |
150 |
- |
151 |
-python_install_all() { |
152 |
- distutils-r1_python_install_all |
153 |
- |
154 |
- dodir /usr/share/${PN} |
155 |
- cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die |
156 |
-} |
157 |
|
158 |
diff --git a/sci-biology/biopython/biopython-1.63-r1.ebuild b/sci-biology/biopython/biopython-1.63-r1.ebuild |
159 |
index aac2bdf..e99f846 100644 |
160 |
--- a/sci-biology/biopython/biopython-1.63-r1.ebuild |
161 |
+++ b/sci-biology/biopython/biopython-1.63-r1.ebuild |
162 |
@@ -23,6 +23,7 @@ RDEPEND="${PYTHON_DEPS} |
163 |
dev-python/matplotlib[${PYTHON_USEDEP}] |
164 |
dev-python/networkx[${PYTHON_USEDEP}] |
165 |
dev-python/numpy[${PYTHON_USEDEP}] |
166 |
+ dev-python/rdflib[${PYTHON_USEDEP}] |
167 |
dev-python/pygraphviz[${PYTHON_USEDEP}] |
168 |
dev-python/reportlab[${PYTHON_USEDEP}] |
169 |
media-gfx/pydot[${PYTHON_USEDEP}] |
170 |
|
171 |
diff --git a/sci-biology/biopython/biopython-1.63.ebuild b/sci-biology/biopython/biopython-1.63.ebuild |
172 |
deleted file mode 100644 |
173 |
index 5180b33..0000000 |
174 |
--- a/sci-biology/biopython/biopython-1.63.ebuild |
175 |
+++ /dev/null |
176 |
@@ -1,50 +0,0 @@ |
177 |
-# Copyright 1999-2014 Gentoo Foundation |
178 |
-# Distributed under the terms of the GNU General Public License v2 |
179 |
-# $Header: /var/cvsroot/gentoo-x86/sci-biology/biopython/biopython-1.62.ebuild,v 1.1 2013/09/17 16:07:56 jlec Exp $ |
180 |
- |
181 |
-EAPI=5 |
182 |
- |
183 |
-PYTHON_COMPAT=( python{2_6,2_7} ) |
184 |
- |
185 |
-inherit distutils-r1 eutils |
186 |
- |
187 |
-DESCRIPTION="Python modules for computational molecular biology" |
188 |
-HOMEPAGE="http://www.biopython.org/ http://pypi.python.org/pypi/biopython/" |
189 |
-SRC_URI="http://www.biopython.org/DIST/${P}.tar.gz" |
190 |
- |
191 |
-LICENSE="HPND" |
192 |
-SLOT="0" |
193 |
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" |
194 |
-IUSE="mysql postgres" |
195 |
- |
196 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
197 |
- |
198 |
-RDEPEND="${PYTHON_DEPS} |
199 |
- dev-python/matplotlib[${PYTHON_USEDEP}] |
200 |
- dev-python/networkx[${PYTHON_USEDEP}] |
201 |
- dev-python/numpy[${PYTHON_USEDEP}] |
202 |
- dev-python/pygraphviz[${PYTHON_USEDEP}] |
203 |
- dev-python/reportlab[${PYTHON_USEDEP}] |
204 |
- media-gfx/pydot[${PYTHON_USEDEP}] |
205 |
- mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] ) |
206 |
- postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )" |
207 |
-DEPEND="${RDEPEND} |
208 |
- sys-devel/flex" |
209 |
- |
210 |
-DOCS=( CONTRIB DEPRECATED NEWS README Doc/. ) |
211 |
- |
212 |
-src_prepare() { |
213 |
- distutils-r1_src_prepare |
214 |
-} |
215 |
- |
216 |
-python_test() { |
217 |
- cd Tests || die |
218 |
- ${PYTHON} run_tests.py || die |
219 |
-} |
220 |
- |
221 |
-python_install_all() { |
222 |
- distutils-r1_python_install_all |
223 |
- |
224 |
- dodir /usr/share/${PN} |
225 |
- cp -r --preserve=mode Scripts Tests "${ED}"/usr/share/${PN} || die |
226 |
-} |
227 |
|
228 |
diff --git a/sci-biology/biopython/files/SeqRecord.py.patch b/sci-biology/biopython/files/SeqRecord.py.patch |
229 |
deleted file mode 100644 |
230 |
index ac3785f..0000000 |
231 |
--- a/sci-biology/biopython/files/SeqRecord.py.patch |
232 |
+++ /dev/null |
233 |
@@ -1,148 +0,0 @@ |
234 |
-diff --git a/Bio/SeqIO/SffIO.py b/Bio/SeqIO/SffIO.py |
235 |
-index 1971dba..43b38fd 100644 |
236 |
---- a/Bio/SeqIO/SffIO.py |
237 |
-+++ b/Bio/SeqIO/SffIO.py |
238 |
-@@ -539,8 +539,15 @@ _valid_UAN_read_name = re.compile(r'^[a-zA-Z0-9]{14}$') |
239 |
- |
240 |
- |
241 |
- def _sff_read_seq_record(handle, number_of_flows_per_read, flow_chars, |
242 |
-- key_sequence, alphabet, trim=False): |
243 |
-- """Parse the next read in the file, return data as a SeqRecord (PRIVATE).""" |
244 |
-+ key_sequence, alphabet, trim=False, interpret_qual_trims=True, interpret_adapter_trims=False): |
245 |
-+ """Parse the next read in the file, return data as a SeqRecord (PRIVATE). |
246 |
-+ Allow user to specify which type of clipping values should be applied |
247 |
-+ while reading the SFF stream. To be backwards compatible, we interpret |
248 |
-+ only the quality-based trim points by default. That results in lower-cased |
249 |
-+ sequences in the low-qual region, regardless what adapter-based clip points |
250 |
-+ say. This should be the desired behavior. More discussion at |
251 |
-+ https://redmine.open-bio.org/issues/3437 |
252 |
-+ """ |
253 |
- #Now on to the reads... |
254 |
- #the read header format (fixed part): |
255 |
- #read_header_length H |
256 |
-@@ -589,20 +596,41 @@ def _sff_read_seq_record(handle, number_of_flows_per_read, flow_chars, |
257 |
- warnings.warn("Post quality %i byte padding region contained data, SFF data is not broken" |
258 |
- % padding) |
259 |
- #Follow Roche and apply most aggressive of qual and adapter clipping. |
260 |
-- #Note Roche seems to ignore adapter clip fields when writing SFF, |
261 |
-- #and uses just the quality clipping values for any clipping. |
262 |
-- clip_left = max(clip_qual_left, clip_adapter_left) |
263 |
-- #Right clipping of zero means no clipping |
264 |
-- if clip_qual_right: |
265 |
-- if clip_adapter_right: |
266 |
-- clip_right = min(clip_qual_right, clip_adapter_right) |
267 |
-+ #Note Roche does not use adapter clip fields when writing SFF files |
268 |
-+ #but instead combines the adapter clipping information with quality-based |
269 |
-+ #values and writes the most aggressive combination into clip fields (as |
270 |
-+ #allowed by SFF specs). |
271 |
-+ |
272 |
-+ if interpret_qual_trims: |
273 |
-+ if interpret_adapter_trims: |
274 |
-+ clip_left = max(clip_qual_left, clip_adapter_left) |
275 |
-+ #Right clipping of zero means no clipping |
276 |
-+ if clip_qual_right: |
277 |
-+ if clip_adapter_right: |
278 |
-+ clip_right = min(clip_qual_right, clip_adapter_right) |
279 |
-+ else: |
280 |
-+ #Typical case with Roche SFF files |
281 |
-+ clip_right = clip_qual_right |
282 |
-+ elif clip_adapter_right: |
283 |
-+ clip_right = clip_adapter_right |
284 |
-+ else: |
285 |
-+ clip_right = seq_len |
286 |
- else: |
287 |
-- #Typical case with Roche SFF files |
288 |
-- clip_right = clip_qual_right |
289 |
-- elif clip_adapter_right: |
290 |
-- clip_right = clip_adapter_right |
291 |
-+ clip_left = clip_qual_left |
292 |
-+ if clip_qual_right: |
293 |
-+ clip_right = clip_qual_right |
294 |
-+ else: |
295 |
-+ clip_right = seq_len |
296 |
-+ elif interpret_adapter_trims: |
297 |
-+ clip_left = clip_adapter_left |
298 |
-+ if clip_adapter_right: |
299 |
-+ clip_right = clip_adapter_right |
300 |
-+ else: |
301 |
-+ clip_right = seq_len |
302 |
- else: |
303 |
-- clip_right = seq_len |
304 |
-+ clip_left = 0 |
305 |
-+ clip_right = seq_len |
306 |
-+ |
307 |
- #Now build a SeqRecord |
308 |
- if trim: |
309 |
- seq = seq[clip_left:clip_right].upper() |
310 |
-diff --git a/Bio/SeqRecord.py b/Bio/SeqRecord.py |
311 |
-index c90e13b..66bdea0 100644 |
312 |
---- a/Bio/SeqRecord.py |
313 |
-+++ b/Bio/SeqRecord.py |
314 |
-@@ -14,6 +14,8 @@ __docformat__ = "epytext en" # Simple markup to show doctests nicely |
315 |
- # also BioSQL.BioSeq.DBSeq which is the "Database Seq" class) |
316 |
- |
317 |
- |
318 |
-+from Bio.Seq import Seq |
319 |
-+ |
320 |
- class _RestrictedDict(dict): |
321 |
- """Dict which only allows sequences of given length as values (PRIVATE). |
322 |
- |
323 |
-@@ -76,7 +78,7 @@ class _RestrictedDict(dict): |
324 |
- if not hasattr(value, "__len__") or not hasattr(value, "__getitem__") \ |
325 |
- or (hasattr(self, "_length") and len(value) != self._length): |
326 |
- raise TypeError("We only allow python sequences (lists, tuples or " |
327 |
-- "strings) of length %i." % self._length) |
328 |
-+ "strings) of length %i whereas you passed an object of length %s." % (self._length, str(len(value)))) |
329 |
- dict.__setitem__(self, key, value) |
330 |
- |
331 |
- def update(self, new_dict): |
332 |
-@@ -290,10 +292,11 @@ class SeqRecord(object): |
333 |
- """) |
334 |
- |
335 |
- def _set_seq(self, value): |
336 |
-- #TODO - Add a deprecation warning that the seq should be write only? |
337 |
-- if self._per_letter_annotations: |
338 |
-- #TODO - Make this a warning? Silently empty the dictionary? |
339 |
-- raise ValueError("You must empty the letter annotations first!") |
340 |
-+ # we should be much more user friendly and accept even a plain sequence string |
341 |
-+ # and make the Seq or MutableSeq object ourselves |
342 |
-+ if not isinstance(value, Seq): |
343 |
-+ raise ValueError("You must pass a Seq object containing the new sequence instead of just plain string.") |
344 |
-+ else: |
345 |
- self._seq = value |
346 |
- try: |
347 |
- self._per_letter_annotations = _RestrictedDict(length=len(self.seq)) |
348 |
-@@ -696,7 +699,7 @@ class SeqRecord(object): |
349 |
- SeqIO.write(self, handle, format_spec) |
350 |
- return handle.getvalue() |
351 |
- |
352 |
-- def __len__(self): |
353 |
-+ def __len__(self, trim=False, interpret_qual_trims=True, interpret_adapter_trims=False): |
354 |
- """Returns the length of the sequence. |
355 |
- |
356 |
- For example, using Bio.SeqIO to read in a FASTA nucleotide file: |
357 |
-@@ -707,6 +710,10 @@ class SeqRecord(object): |
358 |
- 309 |
359 |
- >>> len(record.seq) |
360 |
- 309 |
361 |
-+ |
362 |
-+ It should be possible to get length of a raw object, of trimmed |
363 |
-+ object by quality or adapter criteria or both, whenever user wants |
364 |
-+ to, not only when data is parsed from input. |
365 |
- """ |
366 |
- return len(self.seq) |
367 |
- |
368 |
-@@ -725,6 +732,13 @@ class SeqRecord(object): |
369 |
- """ |
370 |
- return True |
371 |
- |
372 |
-+ def apply_trimpoints(self, trim=False, interpret_qual_trims=False, interpret_adapter_trims=False): |
373 |
-+ """We should apply either of the quality-based or adapter-based annotated |
374 |
-+ trim points and return a new, sliced object. |
375 |
-+ """ |
376 |
-+ pass |
377 |
-+ |
378 |
-+ |
379 |
- def __add__(self, other): |
380 |
- """Add another sequence or string to this sequence. |
381 |
- |
382 |
|
383 |
diff --git a/sci-biology/biopython/files/adjust-trimpoints.patch b/sci-biology/biopython/files/adjust-trimpoints.patch |
384 |
deleted file mode 100644 |
385 |
index dd6d548..0000000 |
386 |
--- a/sci-biology/biopython/files/adjust-trimpoints.patch |
387 |
+++ /dev/null |
388 |
@@ -1,76 +0,0 @@ |
389 |
-diff --git a/Bio/SeqIO/SffIO.py b/Bio/SeqIO/SffIO.py |
390 |
-index 1971dba..43b38fd 100644 |
391 |
---- a/Bio/SeqIO/SffIO.py |
392 |
-+++ b/Bio/SeqIO/SffIO.py |
393 |
-@@ -539,8 +539,15 @@ _valid_UAN_read_name = re.compile(r'^[a-zA-Z0-9]{14}$') |
394 |
- |
395 |
- |
396 |
- def _sff_read_seq_record(handle, number_of_flows_per_read, flow_chars, |
397 |
-- key_sequence, alphabet, trim=False): |
398 |
-- """Parse the next read in the file, return data as a SeqRecord (PRIVATE).""" |
399 |
-+ key_sequence, alphabet, trim=False, interpret_qual_trims=True, interpret_adapter_trims=False): |
400 |
-+ """Parse the next read in the file, return data as a SeqRecord (PRIVATE). |
401 |
-+ Allow user to specify which type of clipping values should be applied |
402 |
-+ while reading the SFF stream. To be backwards compatible, we interpret |
403 |
-+ only the quality-based trim points by default. That results in lower-cased |
404 |
-+ sequences in the low-qual region, regardless what adapter-based clip points |
405 |
-+ say. This should be the desired behavior. More discussion at |
406 |
-+ https://redmine.open-bio.org/issues/3437 |
407 |
-+ """ |
408 |
- #Now on to the reads... |
409 |
- #the read header format (fixed part): |
410 |
- #read_header_length H |
411 |
-@@ -589,20 +596,41 @@ def _sff_read_seq_record(handle, number_of_flows_per_read, flow_chars, |
412 |
- warnings.warn("Post quality %i byte padding region contained data, SFF data is not broken" |
413 |
- % padding) |
414 |
- #Follow Roche and apply most aggressive of qual and adapter clipping. |
415 |
-- #Note Roche seems to ignore adapter clip fields when writing SFF, |
416 |
-- #and uses just the quality clipping values for any clipping. |
417 |
-- clip_left = max(clip_qual_left, clip_adapter_left) |
418 |
-- #Right clipping of zero means no clipping |
419 |
-- if clip_qual_right: |
420 |
-- if clip_adapter_right: |
421 |
-- clip_right = min(clip_qual_right, clip_adapter_right) |
422 |
-+ #Note Roche does not use adapter clip fields when writing SFF files |
423 |
-+ #but instead combines the adapter clipping information with quality-based |
424 |
-+ #values and writes the most aggressive combination into clip fields (as |
425 |
-+ #allowed by SFF specs). |
426 |
-+ |
427 |
-+ if interpret_qual_trims: |
428 |
-+ if interpret_adapter_trims: |
429 |
-+ clip_left = max(clip_qual_left, clip_adapter_left) |
430 |
-+ #Right clipping of zero means no clipping |
431 |
-+ if clip_qual_right: |
432 |
-+ if clip_adapter_right: |
433 |
-+ clip_right = min(clip_qual_right, clip_adapter_right) |
434 |
-+ else: |
435 |
-+ #Typical case with Roche SFF files |
436 |
-+ clip_right = clip_qual_right |
437 |
-+ elif clip_adapter_right: |
438 |
-+ clip_right = clip_adapter_right |
439 |
-+ else: |
440 |
-+ clip_right = seq_len |
441 |
- else: |
442 |
-- #Typical case with Roche SFF files |
443 |
-- clip_right = clip_qual_right |
444 |
-- elif clip_adapter_right: |
445 |
-- clip_right = clip_adapter_right |
446 |
-+ clip_left = clip_qual_left |
447 |
-+ if clip_qual_right: |
448 |
-+ clip_right = clip_qual_right |
449 |
-+ else: |
450 |
-+ clip_right = seq_len |
451 |
-+ elif interpret_adapter_trims: |
452 |
-+ clip_left = clip_adapter_left |
453 |
-+ if clip_adapter_right: |
454 |
-+ clip_right = clip_adapter_right |
455 |
-+ else: |
456 |
-+ clip_right = seq_len |
457 |
- else: |
458 |
-- clip_right = seq_len |
459 |
-+ clip_left = 0 |
460 |
-+ clip_right = seq_len |
461 |
-+ |
462 |
- #Now build a SeqRecord |
463 |
- if trim: |
464 |
- seq = seq[clip_left:clip_right].upper() |