Skip to content

Commit f41eddc

Browse files
authored
Merge pull request #2403 from benjeffery/0.5.1-1.1.0-release-prep
Release prep
2 parents 8a69970 + 42190e1 commit f41eddc

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

c/CHANGELOG.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--------------------
2-
[1.1.0] - 2022-XX-XX
2+
[1.0.1] - 2022-07-14
33
--------------------
44

55
**Features**
@@ -8,7 +8,7 @@
88
nodes of each node in the tree. (:user:`GertjanBisschop`, :issue:`2274`, :pr:`2316`)
99

1010
- Add ``edge`` to ``tsk_tree_t`` an array which contains the ``edge_id`` of the edge encoding
11-
the relationship between the child node and its parent for each (child) node in the tree
11+
the relationship between the child node and its parent for each (child) node in the tree.
1212
(:user:`GertjanBisschop`, :issue:`2304`, :pr:`2340`)
1313

1414

@@ -17,7 +17,7 @@
1717
- Reduce the maximum number of rows in a table by 1. This removes edge cases so that a ``tsk_id_t`` can be
1818
used to count the number of rows. (:user:`benjeffery`, :issue:`2336`, :pr:`2337`)
1919

20-
- Samples are now copied by ``tsk_variant_restricted_copy``. (:user:`benjeffery`, :issue:`2400`, :pr:`XXXX`)
20+
- Samples are now copied by ``tsk_variant_restricted_copy``. (:user:`benjeffery`, :issue:`2400`, :pr:`2401`)
2121

2222

2323
--------------------

c/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.0
1+
1.1.0

c/tskit/core.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ sizes and types of externally visible structs.
138138
The library minor version. Incremented when non-breaking backward-compatible changes
139139
to the API or ABI are introduced, i.e., the addition of a new function.
140140
*/
141-
#define TSK_VERSION_MINOR 0
141+
#define TSK_VERSION_MINOR 1
142142
/**
143143
The library patch version. Incremented when any changes not relevant to the
144144
to the API or ABI are introduced, i.e., internal refactors of bugfixes.

python/CHANGELOG.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
--------------------
2-
[0.5.1] - 2022-0X-XX
2+
[0.5.1] - 2022-07-14
33
--------------------
44

55
**Fixes**
66

77
- Copies of a `Variant` object would cause a segfault when ``.samples`` was accessed.
8-
(:user:`benjeffery`, :issue:`2400`, :pr:`XXXX`)
8+
(:user:`benjeffery`, :issue:`2400`, :pr:`2401`)
99

1010

1111
**Changes**

python/tests/test_lowlevel.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3718,7 +3718,7 @@ def test_kastore_version(self):
37183718

37193719
def test_tskit_version(self):
37203720
version = _tskit.get_tskit_version()
3721-
assert version == (1, 0, 0)
3721+
assert version == (1, 1, 0)
37223722

37233723
def test_tskit_version_file(self):
37243724
maj, min_, patch = _tskit.get_tskit_version()

python/tskit/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Definitive location for the version number.
22
# During development, should be x.y.z.devN
33
# For beta should be x.y.zbN
4-
tskit_version = "0.5.1.dev0"
4+
tskit_version = "0.5.1"

0 commit comments

Comments
 (0)