Skip to content

Commit bb5f4f4

Browse files
Merge pull request #79 from jeromekelleher/release-updates
Release updates
2 parents 7637ea3 + 3a7bed4 commit bb5f4f4

16 files changed

+32
-37
lines changed

c/CHANGELOG.rst

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
--------------------
2-
[0.0.0] - 2019-01-19
1+
----------------------
2+
[0.99.0] - 2019-01-14
3+
----------------------
4+
5+
Initial alpha version of the tskit C API tagged. Version 0.99.x
6+
represents the series of releases leading to version 1.0.0 which
7+
will be the first stable release. After 1.0.0, semver rules
8+
regarding API/ABI breakage will apply; however, in the 0.99.x
9+
series arbitrary changes may happen.
10+
11+
[0.0.0] - 2019-01-10
312
--------------------
413

514
Initial extraction of tskit code from msprime. Relicense to MIT.
File renamed without changes.
File renamed without changes.
File renamed without changes.

c/meson.build

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,30 +23,31 @@ tskit_lib = static_library('tskit',
2323

2424
# We don't specify extra C args here as CUnit won't pass the checks.
2525
test_lib = static_library('testlib',
26-
sources: ['testlib.c'], dependencies: cunit_dep)
26+
sources: ['tests/testlib.c'], dependencies: cunit_dep)
2727

2828
executable('test_core',
29-
sources: ['test_core.c'],
29+
sources: ['tests/test_core.c'],
3030
link_with: [tskit_lib, test_lib], c_args: extra_c_args)
3131
executable('test_tables',
32-
sources: ['test_tables.c'],
32+
sources: ['tests/test_tables.c'],
3333
link_with: [tskit_lib, test_lib], c_args: extra_c_args)
3434
executable('test_trees',
35-
sources: ['test_trees.c'],
35+
sources: ['tests/test_trees.c'],
3636
link_with: [tskit_lib, test_lib], c_args: extra_c_args)
3737
executable('test_genotypes',
38-
sources: ['test_genotypes.c'],
38+
sources: ['tests/test_genotypes.c'],
3939
link_with: [tskit_lib, test_lib], c_args: extra_c_args)
4040
executable('test_convert',
41-
sources: ['test_convert.c'],
41+
sources: ['tests/test_convert.c'],
4242
link_with: [tskit_lib, test_lib], c_args: extra_c_args)
4343
executable('test_stats',
44-
sources: ['test_stats.c'],
44+
sources: ['tests/test_stats.c'],
4545
link_with: [tskit_lib, test_lib], c_args: extra_c_args)
4646

4747
# The development CLI. Don't use extra C args because argtable code won't pass
48-
executable('main',
49-
sources: ['main.c', 'argtable3.c'], link_with: [tskit_lib], c_args:['-Dlint'])
48+
executable('dev-cli',
49+
sources: ['dev-tools/dev-cli.c', 'dev-tools/argtable3.c'],
50+
link_with: [tskit_lib], c_args:['-Dlint'])
5051

5152

5253
# Example programs.
@@ -56,6 +57,6 @@ executable('haploid_wright_fisher',
5657
dependencies: [gsl_dep])
5758

5859
# TMP: until we've ported all the tests, keep this compilable.
59-
#gsl_dep = dependency('gsl')
60-
#executable('old_tests', sources: ['old_tests.c'], link_with: tskit_lib,
61-
# dependencies: [cunit_dep, gsl_dep])
60+
# gsl_dep = dependency('gsl')
61+
# executable('old_tests', sources: ['tests/old_tests.c'], link_with: tskit_lib,
62+
# dependencies: [cunit_dep, gsl_dep])

c/old_tests.c renamed to c/tests/old_tests.c

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,7 @@
1-
/*
2-
** Copyright (C) 2016-2018 University of Oxford
3-
**
4-
** This file is part of msprime.
5-
**
6-
** msprime is free software: you can redistribute it and/or modify
7-
** it under the terms of the GNU General Public License as published by
8-
** the Free Software Foundation, either version 3 of the License, or
9-
** (at your option) any later version.
10-
**
11-
** msprime is distributed in the hope that it will be useful,
12-
** but WITHOUT ANY WARRANTY; without even the implied warranty of
13-
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14-
** GNU General Public License for more details.
15-
**
16-
** You should have received a copy of the GNU General Public License
17-
** along with msprime. If not, see <http://www.gnu.org/licenses/>.
18-
*/
19-
1+
/* TODO these are parts of the tests from msprime that haven't been ported
2+
* into the new test framework yet. Once these have all been moved across
3+
* into the appropriate location, delete.
4+
*/
205
#define _GNU_SOURCE
216
/*
227
* Unit tests for the low-level msprime API.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)