Merge pull request #2403 from benjeffery/0.5.1-1.1.0-release-prep

Release prep
tskit-dev · Jul 14, 2022 · f41eddc · f41eddc
2 parents 8a69970 + 42190e1
commit f41eddc
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/c/CHANGELOG.rst b/c/CHANGELOG.rst
@@ -1,5 +1,5 @@
 --------------------
-[1.1.0] - 2022-XX-XX
+[1.0.1] - 2022-07-14
 --------------------
 
 **Features**
@@ -8,7 +8,7 @@
   nodes of each node in the tree. (:user:`GertjanBisschop`, :issue:`2274`, :pr:`2316`)
 
 - Add ``edge`` to ``tsk_tree_t`` an array which contains the ``edge_id`` of the edge encoding
-  the relationship between the child node and its parent for each (child) node in the tree
+  the relationship between the child node and its parent for each (child) node in the tree.
   (:user:`GertjanBisschop`, :issue:`2304`, :pr:`2340`)
 
 
@@ -17,7 +17,7 @@
 - Reduce the maximum number of rows in a table by 1. This removes edge cases so that a ``tsk_id_t`` can be
   used to count the number of rows. (:user:`benjeffery`, :issue:`2336`, :pr:`2337`)
 
-- Samples are now copied by ``tsk_variant_restricted_copy``. (:user:`benjeffery`, :issue:`2400`, :pr:`XXXX`)
+- Samples are now copied by ``tsk_variant_restricted_copy``. (:user:`benjeffery`, :issue:`2400`, :pr:`2401`)
 
 
 --------------------

diff --git a/c/VERSION.txt b/c/VERSION.txt
@@ -1 +1 @@
-1.0.0
+1.1.0
diff --git a/c/tskit/core.h b/c/tskit/core.h
@@ -138,7 +138,7 @@ sizes and types of externally visible structs.
 The library minor version. Incremented when non-breaking backward-compatible changes
 to the API or ABI are introduced, i.e., the addition of a new function.
 */
-#define TSK_VERSION_MINOR   0
+#define TSK_VERSION_MINOR   1
 /**
 The library patch version. Incremented when any changes not relevant to the
 to the API or ABI are introduced, i.e., internal refactors of bugfixes.

diff --git a/python/CHANGELOG.rst b/python/CHANGELOG.rst
@@ -1,11 +1,11 @@
 --------------------
-[0.5.1] - 2022-0X-XX
+[0.5.1] - 2022-07-14
 --------------------
 
 **Fixes**
 
 - Copies of a `Variant` object would cause a segfault when ``.samples`` was accessed.
-  (:user:`benjeffery`, :issue:`2400`, :pr:`XXXX`)
+  (:user:`benjeffery`, :issue:`2400`, :pr:`2401`)
 
 
 **Changes**

diff --git a/python/tests/test_lowlevel.py b/python/tests/test_lowlevel.py
@@ -3718,7 +3718,7 @@ def test_kastore_version(self):
 
     def test_tskit_version(self):
         version = _tskit.get_tskit_version()
-        assert version == (1, 0, 0)
+        assert version == (1, 1, 0)
 
     def test_tskit_version_file(self):
         maj, min_, patch = _tskit.get_tskit_version()

diff --git a/python/tskit/_version.py b/python/tskit/_version.py
@@ -1,4 +1,4 @@
 # Definitive location for the version number.
 # During development, should be x.y.z.devN
 # For beta should be x.y.zbN
-tskit_version = "0.5.1.dev0"
+tskit_version = "0.5.1"