Skip to content

Commit

Permalink
Release prep
Browse files Browse the repository at this point in the history
  • Loading branch information
benjeffery authored and mergify[bot] committed Jul 29, 2022
1 parent 0e2dddf commit 6c2e27c
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion c/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------
[1.1.1] - 2022-XX-XX
[1.1.1] - 2022-07-29
--------------------

**Bug fixes**
Expand Down
2 changes: 1 addition & 1 deletion c/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.0
1.1.1
2 changes: 1 addition & 1 deletion c/tskit/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ to the API or ABI are introduced, i.e., the addition of a new function.
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.
*/
#define TSK_VERSION_PATCH 0
#define TSK_VERSION_PATCH 1
/** @} */

/*
Expand Down
5 changes: 3 additions & 2 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -1084,8 +1084,9 @@ release process.

### C API

To release the C API, the ``TSK_VERSION_*`` macros should be updated, and the changelog
updated with the release date and version. The changelog should also be checked for
To release the C API, the ``TSK_VERSION_*`` macros should be updated,
along with ``VERSION.txt`` and the changelog updated with the release
date and version. The changelog should also be checked for
completeness. Comparing ``git log --follow --oneline -- c`` with
`git log --follow --oneline -- c/CHANGELOG.rst` may help here.
After the commit including these changes has been merged, tag a
Expand Down
6 changes: 3 additions & 3 deletions python/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------
[0.5.2] - 2022-XX-XX
[0.5.2] - 2022-07-29
--------------------

**Fixes**
Expand All @@ -8,8 +8,8 @@
with large numbers of alleles or very long alleles
(:user:`jeromekelleher`, :pr:`2437`, :issue:`2429`).

- Various memory leaks fixed (:user:`jeromekelleher`, :pr:`2424`, :issue:`2423`,
:issue:`2427`).
- Various circular references fixed, lowering peak memory usage
(:user:`jeromekelleher`, :pr:`2424`, :issue:`2423`, :issue:`2427`).

- Fix bugs in VCF output when there isn't a 1-1 mapping between individuals
and sample nodes (:user:`jeromekelleher`, :pr:`2442`, :issue:`2257`,
Expand Down
2 changes: 1 addition & 1 deletion python/tests/test_lowlevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -3812,7 +3812,7 @@ def test_kastore_version(self):

def test_tskit_version(self):
version = _tskit.get_tskit_version()
assert version == (1, 1, 0)
assert version == (1, 1, 1)

def test_tskit_version_file(self):
maj, min_, patch = _tskit.get_tskit_version()
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.5.2.dev0"
tskit_version = "0.5.2"

0 comments on commit 6c2e27c

Please sign in to comment.