Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions c/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
----------------------
[0.99.11] - 2021-0X-XX
[0.99.11] - 2021-03-16
----------------------

**Features**
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions python/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------
[0.3.5] - 2021-XX-XX
[0.3.5] - 2021-03-16
--------------------

**Features**
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion python/tskit/_version.py
Original file line number Diff line number Diff line change
@@ -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"