Skip to content

Commit

Permalink
Merge pull request #2756 from benjeffery/0.5.5prep
Browse files Browse the repository at this point in the history
0.5.5 Release prep
  • Loading branch information
benjeffery authored May 17, 2023
2 parents 332d5b7 + 4bef5c1 commit fd72573
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 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.2] - 2023-XX-XX
[1.1.2] - 2023-05-17
--------------------

**Performance improvements**
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.1
1.1.2
2 changes: 1 addition & 1 deletion c/tskit/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,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 1
#define TSK_VERSION_PATCH 2
/** @} */

/*
Expand Down
2 changes: 1 addition & 1 deletion python/CHANGELOG.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------
[0.5.5] - 2023-01-XX
[0.5.5] - 2023-05-17
--------------------

**Performance improvements**
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 @@ -3873,7 +3873,7 @@ def test_kastore_version(self):

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

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.5.dev0"
tskit_version = "0.5.5"

0 comments on commit fd72573

Please sign in to comment.