Skip to content

Commit

Permalink
Pre-release tasks
Browse files Browse the repository at this point in the history
  • Loading branch information
benjeffery authored and mergify-bot committed May 14, 2021
1 parent 86a5ee3 commit f1678c9
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions c/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
----------------------
[0.99.12] - 2021-0X-XX
[0.99.12] - 2021-05-14
----------------------

**Breaking changes**
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions python/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
----------------------
[0.3.6] - 2021-0X-XX
----------------------
--------------------
[0.3.6] - 2021-05-14
--------------------

**Breaking changes**

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

0 comments on commit f1678c9

Please sign in to comment.