Merge pull request #79 from jeromekelleher/release-updates

Release updates
tskit-dev · Jan 14, 2019 · bb5f4f4 · bb5f4f4
2 parents 7637ea3 + 3a7bed4
commit bb5f4f4
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 37 deletions.
diff --git a/c/CHANGELOG.rst b/c/CHANGELOG.rst
@@ -1,5 +1,14 @@
---------------------
-[0.0.0] - 2019-01-19
+----------------------
+[0.99.0] - 2019-01-14
+----------------------
+
+Initial alpha version of the tskit C API tagged. Version 0.99.x
+represents the series of releases leading to version 1.0.0 which
+will be the first stable release. After 1.0.0, semver rules
+regarding API/ABI breakage will apply; however, in the 0.99.x
+series arbitrary changes may happen.
+
+[0.0.0] - 2019-01-10
 --------------------
 
 Initial extraction of tskit code from msprime. Relicense to MIT.

diff --git a/c/argtable3.c → c/dev-tools/argtable3.c b/c/argtable3.c → c/dev-tools/argtable3.c
diff --git a/c/argtable3.h → c/dev-tools/argtable3.h b/c/argtable3.h → c/dev-tools/argtable3.h
diff --git a/c/main.c → c/dev-tools/dev-cli.c b/c/main.c → c/dev-tools/dev-cli.c
diff --git a/c/meson.build b/c/meson.build
@@ -23,30 +23,31 @@ tskit_lib = static_library('tskit',
 
 # We don't specify extra C args here as CUnit won't pass the checks.
 test_lib = static_library('testlib', 
-    sources: ['testlib.c'], dependencies: cunit_dep)
+    sources: ['tests/testlib.c'], dependencies: cunit_dep)
 
 executable('test_core', 
-    sources: ['test_core.c'], 
+    sources: ['tests/test_core.c'], 
     link_with: [tskit_lib, test_lib], c_args: extra_c_args)
 executable('test_tables', 
-    sources: ['test_tables.c'], 
+    sources: ['tests/test_tables.c'], 
     link_with: [tskit_lib, test_lib], c_args: extra_c_args)
 executable('test_trees', 
-    sources: ['test_trees.c'], 
+    sources: ['tests/test_trees.c'], 
     link_with: [tskit_lib, test_lib], c_args: extra_c_args)
 executable('test_genotypes', 
-    sources: ['test_genotypes.c'], 
+    sources: ['tests/test_genotypes.c'], 
     link_with: [tskit_lib, test_lib], c_args: extra_c_args)
 executable('test_convert', 
-    sources: ['test_convert.c'], 
+    sources: ['tests/test_convert.c'], 
     link_with: [tskit_lib, test_lib], c_args: extra_c_args)
 executable('test_stats', 
-    sources: ['test_stats.c'], 
+    sources: ['tests/test_stats.c'], 
     link_with: [tskit_lib, test_lib], c_args: extra_c_args)
 
 # The development CLI. Don't use extra C args because argtable code won't pass
-executable('main', 
-    sources: ['main.c', 'argtable3.c'], link_with: [tskit_lib], c_args:['-Dlint'])
+executable('dev-cli', 
+    sources: ['dev-tools/dev-cli.c', 'dev-tools/argtable3.c'], 
+    link_with: [tskit_lib], c_args:['-Dlint'])
 
 
 # Example programs.
@@ -56,6 +57,6 @@ executable('haploid_wright_fisher',
     dependencies: [gsl_dep])
 
 # TMP: until we've ported all the tests, keep this compilable.
-#gsl_dep = dependency('gsl')
-#executable('old_tests', sources: ['old_tests.c'], link_with: tskit_lib, 
-#    dependencies: [cunit_dep, gsl_dep])
+# gsl_dep = dependency('gsl')
+# executable('old_tests', sources: ['tests/old_tests.c'], link_with: tskit_lib, 
+#     dependencies: [cunit_dep, gsl_dep])
diff --git a/c/old_tests.c → c/tests/old_tests.c b/c/old_tests.c → c/tests/old_tests.c
@@ -1,22 +1,7 @@
-/*
-** Copyright (C) 2016-2018 University of Oxford
-**
-** This file is part of msprime.
-**
-** msprime is free software: you can redistribute it and/or modify
-** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation, either version 3 of the License, or
-** (at your option) any later version.
-**
-** msprime is distributed in the hope that it will be useful,
-** but WITHOUT ANY WARRANTY; without even the implied warranty of
-** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-** GNU General Public License for more details.
-**
-** You should have received a copy of the GNU General Public License
-** along with msprime.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
+/* TODO these are parts of the tests from msprime that haven't been ported
+ * into the new test framework yet. Once these have all been moved across
+ * into the appropriate location, delete.
+ */
 #define _GNU_SOURCE
 /*
  * Unit tests for the low-level msprime API.

diff --git a/c/test_convert.c → c/tests/test_convert.c b/c/test_convert.c → c/tests/test_convert.c
diff --git a/c/test_core.c → c/tests/test_core.c b/c/test_core.c → c/tests/test_core.c
diff --git a/c/test_genotypes.c → c/tests/test_genotypes.c b/c/test_genotypes.c → c/tests/test_genotypes.c
diff --git a/c/test_stats.c → c/tests/test_stats.c b/c/test_stats.c → c/tests/test_stats.c
diff --git a/c/test_tables.c → c/tests/test_tables.c b/c/test_tables.c → c/tests/test_tables.c
diff --git a/c/test_trees.c → c/tests/test_trees.c b/c/test_trees.c → c/tests/test_trees.c
diff --git a/c/testlib.c → c/tests/testlib.c b/c/testlib.c → c/tests/testlib.c
diff --git a/c/testlib.h → c/tests/testlib.h b/c/testlib.h → c/tests/testlib.h
diff --git a/python/CHANGELOG.rst b/python/CHANGELOG.rst
@@ -1,5 +1,5 @@
 --------------------
-[0.1.2] - 2019-XX-XX
+[0.1.2] - 2019-01-14
 --------------------
 
 Bugfix release.
@@ -30,13 +30,13 @@ files and processes them should be able to work without changes.
 - Rename ``SparseTree`` class to ``Tree``.
 
 ----------------------
-[0.1.0a1] - 2019-01-19
+[1.1.0a1] - 2019-01-10
 ----------------------
 
 Initial alpha version posted to PyPI for bootstrapping.
 
 --------------------
-[0.0.0] - 2019-01-19
+[0.0.0] - 2019-01-10
 --------------------
 
 Initial extraction of tskit code from msprime. Relicense to MIT.

diff --git a/python/tskit/_version.py b/python/tskit/_version.py
@@ -1,2 +1,2 @@
 # Definitive location for the version number.
-tskit_version = "0.1.1"
+tskit_version = "0.1.2"