Merge pull request #1447 from benjeffery/0.3.6

Pre-release tasks for 0.3.6

Author: benjeffery

c/CHANGELOG.rst

@@ -1,5 +1,5 @@
 ----------------------
-[0.99.12] - 2021-0X-XX
+[0.99.12] - 2021-05-14
 ----------------------
 
 **Breaking changes**
@@ -24,7 +24,7 @@
 - Add ``parents`` to the individual table to enable recording of pedigrees
   (:user:`ivan-krukov`, :user:`benjeffery`, :issue:`852`, :pr:`1125`, :pr:`866`, :pr:`1153`, :pr:`1177`, :pr:`1199`).
 
-- Added a ``tsk_table_collection_canonicalse`` method, that allows checking for equality between
+- Added a ``tsk_table_collection_canonicalise`` method, that allows checking for equality between
   tables that are equivalent up to reordering (:user:`petrelharp`, :user:`mufernando`, :pr:`1108`).
 
 - Removed a previous requirement on ``tsk_table_collection_union``, allowing for unioning of

python/CHANGELOG.rst

@@ -1,6 +1,6 @@
-----------------------
-[0.3.6] - 2021-0X-XX
-----------------------
+--------------------
+[0.3.6] - 2021-05-14
+--------------------
 
 **Breaking changes**
 

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.3.6.dev1"
+tskit_version = "0.3.6"