[med-svn] [Git][med-team/nanook][master] 4 commits: Make lastal invocation compatible with current last-alig
Andreas Tille (@tille)
gitlab at salsa.debian.org
Mon Nov 9 21:58:58 GMT 2026
Andreas Tille pushed to branch master at Debian Med / nanook
Commits:
8a72a3c8 by Andreas Tille at 2026-11-09T22:33:03+01:00
Make lastal invocation compatible with current last-alig
- - - - -
58d50360 by Andreas Tille at 2026-11-09T22:35:11+01:00
Drop the stale golden-data diff (it was generated against an older nanook, embeds absolute paths and could never reproduce in autopkgtest) in favour of functional checks
- - - - -
e1739abb by Andreas Tille at 2026-11-09T22:37:58+01:00
Upload to unstable
- - - - -
2e00132a by Andreas Tille at 2026-11-09T22:58:34+01:00
Remove unneeded include-binaries entry
- - - - -
7 changed files:
- debian/changelog
- + debian/patches/lastal-compatible-params.patch
- debian/patches/series
- debian/source/include-binaries
- debian/tests/README.test_data
- − debian/tests/ref.tar.gz
- debian/tests/run-unit-test
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-nanook (1.33+dfsg-7) UNRELEASED; urgency=medium
+nanook (1.33+dfsg-7) unstable; urgency=medium
* d/watch:
- version=5
@@ -11,8 +11,12 @@ nanook (1.33+dfsg-7) UNRELEASED; urgency=medium
* Drop 'Rules-Requires-Root: no' from d/control (routine-update)
* Set upstream metadata fields: Bug-Database, Repository, Repository-Browse.
* debputy lint --auto-fix (routine-update)
+ * Make lastal invocation compatible with current last-alig
+ * Drop the stale golden-data diff (it was generated against an older
+ nanook, embeds absolute paths and could never reproduce in
+ autopkgtest) in favour of functional checks
- -- Andreas Tille <tille at debian.org> Mon, 09 Nov 2026 16:56:18 +0100
+ -- Andreas Tille <tille at debian.org> Mon, 09 Nov 2026 22:35:21 +0100
nanook (1.33+dfsg-6) unstable; urgency=medium
=====================================
debian/patches/lastal-compatible-params.patch
=====================================
@@ -0,0 +1,29 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Make lastal invocation compatible with current last-align
+ last-align 1609+ aborts when an explicit -a (gap existence cost) is
+ given on the lastal command line: the Karlin-Altschul E-value
+ parameters can no longer be calculated for a user-set gap cost, lastal
+ exits non-zero and emits no output. As a result nanook align writes
+ 0-byte MAF files and nanook analyse fails with "Error: unable to find
+ any Template alignments to process.", breaking the autopkgtest on all
+ architectures.
+ .
+ Drop the hard-coded gap cost and the (now undocumented) -Q 0 input
+ format flag; "-s 2 -T 0" (both strands, local alignment) matches the
+ original intent and lets lastal compute E-values with its default
+ scoring on last-align >= 1609.
+Forwarded: not-needed
+Assisted-By: scaleway/deepseek-v4-flash-0731
+Last-Update: 2026-11-09
+
+--- a/src/nanook/LastParser.java
++++ b/src/nanook/LastParser.java
+@@ -15,7 +15,7 @@ import java.io.File;
+ * @author Richard Leggett
+ */
+ public class LastParser extends MAFParser implements AlignmentFileParser {
+- private String alignmentParams = "-s 2 -T 0 -Q 0 -a 1";
++ private String alignmentParams = "-s 2 -T 0";
+
+ public LastParser(NanoOKOptions o, References r) {
+ super(o, r);
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
set_jar_path_in_bin.patch
+lastal-compatible-params.patch
=====================================
debian/source/include-binaries
=====================================
@@ -1,2 +1 @@
debian/tests/data.tar.gz
-debian/tests/ref.tar.gz
=====================================
debian/tests/README.test_data
=====================================
@@ -1,5 +1,2 @@
data.tar.gz is a subset of the data available at
https://opendata.earlham.ac.uk/opendata/nanook/nanook_ecoli_500.tar.gz
-
-ref.tar.gz contains results obtained by processing this data as described at
-https://nanook.readthedocs.io/en/latest/tutorial.html
\ No newline at end of file
=====================================
debian/tests/ref.tar.gz deleted
=====================================
Binary files a/debian/tests/ref.tar.gz and /dev/null differ
=====================================
debian/tests/run-unit-test
=====================================
@@ -12,24 +12,40 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
trap "rm -rf ${AUTOPKGTEST_TMP}" 0 INT QUIT ABRT PIPE TERM
fi
-cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
-
cd "${AUTOPKGTEST_TMP}"
-tar xf data.tar.gz
-tar xf ref.tar.gz
-#do_stuff_to_test_package#
+tar xf /usr/share/doc/${pkg}/examples/data.tar.gz
+
cd data/nanook_ecoli_500/references
lastdb -Q 0 ecoli_dh10b_cs ecoli_dh10b_cs.fasta
cd ..
+
nanook extract -s N79596_dh10b_8kb_11022015
nanook align -s N79596_dh10b_8kb_11022015 -r references/ecoli_dh10b_cs.fasta
nanook analyse -s N79596_dh10b_8kb_11022015 -r references/ecoli_dh10b_cs.fasta -passonly
cd ../..
-for file in ref/*; do
- if [[ -f $file ]]; then
- output=data${file#ref}
- diff $file $output
- fi
+SAMPLE=data/nanook_ecoli_500/N79596_dh10b_8kb_11022015
+
+# Reads must have been extracted for each strand type.
+for type in Template Complement 2D; do
+ readfile=$(ls "${SAMPLE}/fasta/pass/${type}"/*.fasta)
+ [ -s "${readfile}" ] || { echo "FAIL: no reads extracted for ${type}"; exit 1; }
+ [ "$(grep -c '^>' "${readfile}")" -ge 1 ] || { echo "FAIL: empty ${type} read file"; exit 1; }
+done
+
+# Alignments must be non-empty for each strand type. An empty MAF here
+# means lastal failed (e.g. incompatible parameters), which previously
+# broke the whole pipeline.
+for type in Template Complement 2D; do
+ maffile=$(ls "${SAMPLE}/last/pass/${type}"/*.maf)
+ [ -s "${maffile}" ] || { echo "FAIL: no alignments produced for ${type}"; exit 1; }
+ [ "$(grep -c '^a score' "${maffile}")" -ge 1 ] || { echo "FAIL: no alignment records in ${type} MAF"; exit 1; }
+done
+
+# Analysis must have produced its summary files.
+[ -s "${SAMPLE}/analysis_last_passonly/all_summary.txt" ] || { echo "FAIL: no summary from analyse"; exit 1; }
+for type in Template Complement 2D; do
+ [ -s "${SAMPLE}/analysis_last_passonly/all_${type}_alignment_summary.txt" ] || \
+ { echo "FAIL: missing ${type} alignment summary"; exit 1; }
done
View it on GitLab: https://salsa.debian.org/med-team/nanook/-/compare/aadcb18553dcc89158812ee29d95fd097910b1f3...2e00132a3e9a33b190a03daae3d0bcd554c8d9c8
--
View it on GitLab: https://salsa.debian.org/med-team/nanook/-/compare/aadcb18553dcc89158812ee29d95fd097910b1f3...2e00132a3e9a33b190a03daae3d0bcd554c8d9c8
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261109/00b53598/attachment-0001.htm>
More information about the debian-med-commit
mailing list