Version 1.3.0

KirillKryukov · May 17, 2021 · 1198b8a · 1198b8a
1 parent 71dd5e3
commit 1198b8a
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # NAF Changelog
 
 ## Current
+
+## 1.3.0 - 2021-05-17
 - Added `--long` option to _ennaf_ for setting sequence window size.
 - Added `--binary` shortcut option to _unnaf_. 
 - Added support for empty sequences.

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 
 export prefix = /usr/local
 
-.PHONY: default all test clean install uninstall
+.PHONY: default all test test-large clean install uninstall
 
 default:
 	$(MAKE) -C zstd/lib ZSTD_LEGACY_SUPPORT=0 ZSTD_LIB_DEPRECATED=0 ZSTD_LIB_DICTBUILDER=0 libzstd.a
@@ -15,6 +15,9 @@ all: default
 test:
 	$(MAKE) -C tests
 
+test-large:
+	$(MAKE) -C tests large
+
 clean:
 	$(MAKE) -C ennaf clean
 	$(MAKE) -C unnaf clean

diff --git a/ennaf/src/ennaf.c b/ennaf/src/ennaf.c
@@ -4,8 +4,8 @@
  * See README.md and LICENSE files of this repository
  */
 
-#define VERSION "1.2.1"
-#define DATE "2021-05-12"
+#define VERSION "1.3.0"
+#define DATE "2021-05-17"
 #define COPYRIGHT_YEARS "2018-2021"
 
 #include "platform.h"

diff --git a/tests/Makefile b/tests/Makefile
@@ -1,5 +1,5 @@
 
-.PHONY: default all clean
+.PHONY: default all large clean
 
 export TMPDIR=temp
 
@@ -11,6 +11,12 @@ all:
 	@./test-runner.pl interface alphabet charcount small
 	@echo "Success!"
 
+large:
+	@diff -q Makefile Makefile
+	@mkdir -p temp
+	@./test-runner.pl large
+	@echo "Success!"
+
 clean:
 	@rm -f */*.out
 	@rm -f */*.err

diff --git a/tests/interface/ennaf-version.err-ref b/tests/interface/ennaf-version.err-ref
@@ -1,2 +1,2 @@
-ennaf - NAF compressor, version 1.2.1, 2021-05-12
+ennaf - NAF compressor, version 1.3.0, 2021-05-17
 Copyright (c) 2018-2021 Kirill Kryukov
diff --git a/tests/interface/unnaf-version.err-ref b/tests/interface/unnaf-version.err-ref
@@ -1,2 +1,2 @@
-unnaf - NAF decompressor, version 1.2.1, 2021-05-12
+unnaf - NAF decompressor, version 1.3.0, 2021-05-17
 Copyright (c) 2018-2021 Kirill Kryukov
diff --git a/tests/large/1-default-22-31.e.err-ref b/tests/large/1-default-22-31.e.err-ref
@@ -0,0 +1,2 @@
+input has 1 unexpected DNA characters:
+    'Z': 1
diff --git a/tests/large/1-default-22-31.out-ref b/tests/large/1-default-22-31.out-ref
@@ -0,0 +1,4 @@
+>1
+actgACGTnN
+>2 seq2
+a-tN-MY
diff --git a/tests/large/1-default-22-31.test b/tests/large/1-default-22-31.test
@@ -0,0 +1 @@
+ennaf -22 --long 31 {GROUP}.fa 2>{TEST}.e.err | unnaf >{TEST}.out 2>{TEST}.u.err
diff --git a/tests/large/1-default-22-31.u.err-ref b/tests/large/1-default-22-31.u.err-ref
diff --git a/tests/large/1.fa b/tests/large/1.fa
@@ -0,0 +1,4 @@
+>1
+actgACGTnN
+>2 seq2
+a-tZ-MY
diff --git a/unnaf/src/unnaf.c b/unnaf/src/unnaf.c
@@ -4,8 +4,8 @@
  * See README.md and LICENSE files of this repository
  */
 
-#define VERSION "1.2.1"
-#define DATE "2021-05-12"
+#define VERSION "1.3.0"
+#define DATE "2021-05-17"
 #define COPYRIGHT_YEARS "2018-2021"
 
 #include "platform.h"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		ennaf -22 --long 31 {GROUP}.fa 2>{TEST}.e.err \| unnaf >{TEST}.out 2>{TEST}.u.err