Skip to content

Commit 1e66249

Browse files
authored
Merge pull request #1047 from benjeffery/0.3.3-prep
0.3.3 prep
2 parents bad0a89 + 7eecb17 commit 1e66249

File tree

3 files changed

+37
-39
lines changed

3 files changed

+37
-39
lines changed

c/CHANGELOG.rst

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---------------------
2-
[0.99.8] - 2020-XX-XX
2+
[0.99.8] - 2020-11-27
33
---------------------
44

55
**Breaking changes**
@@ -8,16 +8,15 @@
88
and table equality methods to allow for more flexible equality criteria
99
(e.g., ignore top-level metadata and schema or provenance tables).
1010
Existing code should add an extra final parameter ``0`` to retain the
11-
current behaviour. (:user:`mufernando`, :user:`jeromekelleher`,
11+
current behaviour (:user:`mufernando`, :user:`jeromekelleher`,
1212
:issue:`896`, :pr:`897`, :issue:`913`, :pr:`917`).
1313

1414
- Changed default behaviour of ``tsk_table_collection_clear`` to not clear
1515
provenances and added ``options`` argument to optionally clear provenances
16-
and schemas.
17-
(:user:`benjeffery`, :issue:`929`, :pr:`1001`)
16+
and schemas (:user:`benjeffery`, :issue:`929`, :pr:`1001`).
1817

19-
- Exposed ``tsk_table_collection_set_indexes`` to the API.
20-
(:user:`benjeffery`, :issue:`870`, :pr:`921`)
18+
- Exposed ``tsk_table_collection_set_indexes`` to the API
19+
(:user:`benjeffery`, :issue:`870`, :pr:`921`).
2120

2221
- Renamed ``ts.trait_regression`` to ``ts.trait_linear_model``.
2322

@@ -26,10 +25,10 @@
2625
---------------------
2726

2827
- Added ``TSK_INCLUDE_TERMINAL`` option to ``tsk_diff_iter_init`` to output the last edges
29-
at the end of a tree sequence (:user:`hyanwong`, :issue:`783`, :pr:`787`)
28+
at the end of a tree sequence (:user:`hyanwong`, :issue:`783`, :pr:`787`).
3029

3130
- Added ``tsk_bug_assert`` for assertions that should be compiled into release binaries
32-
(:user:`benjeffery`, :pr:`860`)
31+
(:user:`benjeffery`, :pr:`860`).
3332

3433
---------------------
3534
[0.99.6] - 2020-09-04

python/CHANGELOG.rst

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
--------------------
2-
[0.X.X] - 2020-XX-XX
2+
[0.3.3] - 2020-11-27
33
--------------------
44

55
**Features**
66

77
- Expose ``TreeSequence.coiterate()`` method to allow iteration over 2 sequences
8-
simultaneously, aiding comparison of trees from two sequences.
9-
(:user:`jeromekelleher`, :user:`hyanwong`, :issue:`1021`, :pr:`1022`)
8+
simultaneously, aiding comparison of trees from two sequences
9+
(:user:`jeromekelleher`, :user:`hyanwong`, :issue:`1021`, :pr:`1022`).
1010

11-
- tskit is now supported on, and has wheels for, python3.9.
12-
(:user:`benjeffery`, :issue:`982`, :pr:`907`)
11+
- tskit is now supported on, and has wheels for, python3.9
12+
(:user:`benjeffery`, :issue:`982`, :pr:`907`).
1313

1414
- ``Tree.newick()`` now has extra option ``include_branch_lengths`` to allow branch
1515
lengths to be omitted (:user:`hyanwong`, :pr:`931`).
@@ -22,56 +22,55 @@
2222

2323
- Added ``equals`` method to TreeSequence, TableCollection and each of the tables which
2424
provides more flexible equality comparisons, for example, allowing
25-
users to ignore metadata or provenance in the comparison.
25+
users to ignore metadata or provenance in the comparison
2626
(:user:`mufernando`, :user:`jeromekelleher`, :issue:`896`, :pr:`897`,
2727
:issue:`913`, :pr:`917`).
2828

29-
- Added ``__eq__`` to TreeSequence.
30-
(:user:`benjeffery`, :issue:`1011`, :pr:`1020`)
29+
- Added ``__eq__`` to TreeSequence
30+
(:user:`benjeffery`, :issue:`1011`, :pr:`1020`).
3131

3232
- ``ts.dump`` and ``tskit.load`` now support reading and writing file objects such as
33-
FIFOs and sockets. (:user:`benjeffery`, :issue:`657`, :pr:`909`)
33+
FIFOs and sockets (:user:`benjeffery`, :issue:`657`, :pr:`909`).
3434

35-
- Added ``tskit.write_ms`` for writing to MS format.
36-
(:user:`saurabhbelsare`, :issue:`727`, :pr:`854`)
35+
- Added ``tskit.write_ms`` for writing to MS format
36+
(:user:`saurabhbelsare`, :issue:`727`, :pr:`854`).
3737

38-
- Added ``TableCollection.indexes`` for access to the edge insertion/removal order indexes.
39-
(:user:`benjeffery`, :issue:`4`, :pr:`916`)
38+
- Added ``TableCollection.indexes`` for access to the edge insertion/removal order indexes
39+
(:user:`benjeffery`, :issue:`4`, :pr:`916`).
4040

41-
- The dictionary representation of a TableCollection now contains its index.
42-
(:user:`benjeffery`, :issue:`870`, :pr:`921`)
41+
- The dictionary representation of a TableCollection now contains its index
42+
(:user:`benjeffery`, :issue:`870`, :pr:`921`).
4343

44-
- Added ``TreeSequence._repr_html_`` for use in jupyter notebooks.
45-
(:user:`benjeffery`, :issue:`872`, :pr:`923`)
44+
- Added ``TreeSequence._repr_html_`` for use in jupyter notebooks
45+
(:user:`benjeffery`, :issue:`872`, :pr:`923`).
4646

47-
- Added ``TreeSequence.__str__`` to display a summary for terminal usage.
48-
(:user:`benjeffery`, :issue:`938`, :pr:`985`)
47+
- Added ``TreeSequence.__str__`` to display a summary for terminal usage
48+
(:user:`benjeffery`, :issue:`938`, :pr:`985`).
4949

5050
- Added ``TableCollection.dump`` and ``TableCollection.load``. This allows table
51-
collections that are not valid tree sequences to be manipulated.
52-
(:user:`benjeffery`, :issue:`14`, :pr:`986`)
51+
collections that are not valid tree sequences to be manipulated
52+
(:user:`benjeffery`, :issue:`14`, :pr:`986`).
5353

5454
- Added ``nbytes`` method to tables, ``TableCollection`` and ``TreeSequence`` which
55-
reports the size in bytes of those objects.
56-
(:user:`jeromekelleher`, :user:`benjeffery`, :issue:`54`, :pr:`871`)
55+
reports the size in bytes of those objects
56+
(:user:`jeromekelleher`, :user:`benjeffery`, :issue:`54`, :pr:`871`).
5757

5858
- Added ``TableCollection.clear`` to clear data table rows and optionally
59-
provenances, table schemas and tree-sequence level metadata and schema.
60-
(:user:`benjeffery`, :issue:`929`, :pr:`1001`)
59+
provenances, table schemas and tree-sequence level metadata and schema
60+
(:user:`benjeffery`, :issue:`929`, :pr:`1001`).
6161

6262
**Bugfixes**
6363

6464
- ``LightWeightTableCollection.asdict`` and ``TableCollection.asdict`` now return copies
65-
of arrays.
66-
(:user:`benjeffery`, :issue:`1025`, :pr:`1029`)
65+
of arrays (:user:`benjeffery`, :issue:`1025`, :pr:`1029`).
6766

6867
- The ``map_mutations`` method previously used the Fitch parsimony method, but this
6968
does not produce parsimonious results on non-binary trees. We now now use the
70-
Hartigan parsimony algorithm, which does. (:user:`jeromekelleher`,
69+
Hartigan parsimony algorithm, which does (:user:`jeromekelleher`,
7170
:issue:`987`, :pr:`1030`).
7271

73-
- The ``flag`` argument to tables' ``add_row`` was treating the value as signed.
74-
(:user:`benjeffery`, :issue:`1027`, :pr:`1031`)
72+
- The ``flag`` argument to tables' ``add_row`` was treating the value as signed
73+
(:user:`benjeffery`, :issue:`1027`, :pr:`1031`).
7574

7675
**Breaking changes**
7776

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.3.3.dev1"
4+
tskit_version = "0.3.3"

0 commit comments

Comments
 (0)