Skip to content

Commit 48b1ab5

Browse files
committed
Merge branch 'dev/1.2.4' into 'release/1.2'
Merge dev/1.2.4 into release/1.2 See merge request !38
2 parents 27cf4a0 + 02ca186 commit 48b1ab5

28 files changed

+426
-101
lines changed

CHANGELOG.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22

33
All notable changes to Neptune will be documented in this file.
44

5+
## [1.2.4] - 2017-02-27
6+
7+
This release makes several small improvements, including: reducing the standard
8+
output clutter, adding timings to stages, and updating the documentation.
9+
10+
### Added
11+
- Links in the README to the manual.
12+
- Walkthrough to the manual.
13+
- Example data to test the software.
14+
- Timings for stages.
15+
16+
### Changed:
17+
- Improved clarity in manual.
18+
- Codeblocks in the manual.
19+
20+
### Removed
21+
- Considerable clutter has been removed from standard output.
22+
523
## [1.2.3] - 2016-07-11
624

725
This release simplifies the installation process.

INSTALL.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,7 @@ BIN=$PREFIX/bin
1515
LIB=$PREFIX/lib
1616

1717
# Create directories if needed:
18-
if [ ! -d "$PREFIX" ]; then
19-
mkdir $PREFIX
20-
fi
21-
22-
if [ ! -d "$BIN" ]; then
23-
mkdir $BIN
24-
fi
25-
26-
if [ ! -d "$LIB" ]; then
27-
mkdir $LIB
28-
fi
18+
mkdir -p "$PREFIX"/{bin,lib}
2919

3020
# Create Python virtual environment:
3121
VENV=$LIB/neptune

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Neptune
22

3-
Copyright Government of Canada 2015-2016
3+
Copyright Government of Canada 2015-2017
44

55
Written by: Eric Marinier, Public Health Agency of Canada,
66
National Microbiology Laboratory

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
Neptune
88

9-
Copyright Government of Canada 2015-2016
9+
Copyright Government of Canada 2015-2017
1010

1111
Written by: Eric Marinier, Public Health Agency of Canada,
1212
National Microbiology Laboratory
@@ -38,11 +38,10 @@ probabilistic models instead of heuristic strategies.
3838
## Release ##
3939
-------------
4040

41-
**Neptune 1.2.3**
41+
**Neptune 1.2.4**
4242

43-
2016 July 11
44-
45-
This release simplifies the installation process.
43+
This release makes several small improvements, including: reducing the standard
44+
output clutter, adding timings to stages, and updating the documentation.
4645

4746
## Requirements ##
4847
------------------
@@ -68,8 +67,9 @@ Otherwise, the following dependencies must be installed manually:
6867
## Installation ##
6968
------------------
7069

71-
It is strongly recommended you refer to the manual for full installation
72-
instructions. Neptune may be installed using the following command:
70+
It is strongly recommended you refer to the
71+
[manual](documentation/manual/Manual.pdf) for full installation instructions.
72+
Neptune may be installed using the following command:
7373

7474
$ INSTALL.sh
7575

@@ -89,7 +89,7 @@ A simple example of running Neptune:
8989
$ neptune --inclusion /path/to/inclusion/ --exclusion /path/to/exclusion/
9090
--output /path/to/output/
9191

92-
Please refer to the documentation for more details.
92+
Please refer to the [manual](documentation/manual/Manual.pdf) for more details.
9393

9494
## Contact ##
9595
-------------

documentation/manual/Manual.pdf

21.8 KB
Binary file not shown.

0 commit comments

Comments
 (0)