Merge pull request #1247 from benjeffery/release-prep

0.3.5 and C_0.99.11 release prep

Author: mergify[bot]

c/CHANGELOG.rst

@@ -1,5 +1,5 @@
 ----------------------
-[0.99.11] - 2021-0X-XX
+[0.99.11] - 2021-03-16
 ----------------------
 
 **Features**
@@ -23,12 +23,14 @@
 - Add an ``options`` argument to ``tsk_table_collection_subset`` (:user:`petrelharp`, :pr:`1108`),
   to allow for retaining the order of populations.
 
+- Mutation error codes have changed
+
 **Changes**
 
 - Allow mutations that have the same derived state as their parent mutation.
   (:user:`benjeffery`, :issue:`1180`, :pr:`1233`)
 
-**Bugfixes**
+- File minor version change to support individual parents
 
 ----------------------
 [0.99.10] - 2021-01-25

python/CHANGELOG.rst

@@ -1,5 +1,5 @@
 --------------------
-[0.3.5] - 2021-XX-XX
+[0.3.5] - 2021-03-16
 --------------------
 
 **Features**
@@ -41,9 +41,11 @@
 - Allow mutations that have the same derived state as their parent mutation.
   (:user:`benjeffery`, :issue:`1180`, :pr:`1233`)
 
+- File minor version change to support individual parents
+
 **Breaking changes**
 
-- tskit now requires Python 3.6 (:user:`benjeffery`, :pr:`xxxx`)
+- tskit now requires Python 3.6 (:user:`benjeffery`, :pr:`1235`)
 
 --------------------
 [0.3.4] - 2020-12-02

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.5.dev1"
+tskit_version = "0.3.5"