diff --git a/ROADMAP.md b/ROADMAP.md deleted file mode 100644 index 7f8da505f1..0000000000 --- a/ROADMAP.md +++ /dev/null @@ -1,38 +0,0 @@ -This roadmap is a rough plan of upcoming work. Contributions are welcome at anytime, -no matter where something is on this list. - -## Upcoming releases -### [C API 1.0](https://github.com/tskit-dev/tskit/milestone/1) -- Reduce memory usage of loading and saving by making them zero in-memory copy. -- Document all structs and methods that will be stable and supported indefinitely. -- Remove legacy cruft. -- Return genotypes as 32bit ints. -- Other clean up including sorting bugs and small features. (see milestone issue list) - - -## [Python 0.5.0](https://github.com/tskit-dev/tskit/milestone/32) -- Python release to accompany C API 1.0. -- Random access to site genotypes - -## [Python 0.5.1](https://github.com/tskit-dev/tskit/milestone/33) -- Python release to complete features needed for the tskit paper. -- Fast newick parsing - -## [Python 0.5.2](https://github.com/tskit-dev/tskit/milestone/27) - -## Medium term priorities - -### [Metadata](https://github.com/tskit-dev/tskit/projects/7) - - Improve user experience by adding convenience methods for updating, retrieving metadata and schemas - - Codec performance - - Standardised schemas - -### [Stats API](https://github.com/tskit-dev/tskit/projects/6) - - Added stats and options - - Improve errors - - (Fully deal with missing data)[https://github.com/tskit-dev/tskit/issues/287] - - Time windowed statistics - -### [Random Tree Access](https://github.com/tskit-dev/tskit/projects/5) - - Build indexes to allow performant random tree access - diff --git a/c/CHANGELOG.rst b/c/CHANGELOG.rst index 2d286ed575..61fa320f6b 100644 --- a/c/CHANGELOG.rst +++ b/c/CHANGELOG.rst @@ -4,6 +4,14 @@ **Features** +**Bug fixes** + +-------------------- +[1.1.3] - 2024-10-16 +-------------------- + +**Features** + - Add the `tsk_treeseq_extend_haplotypes` method that can compress a tree sequence by extending edges into adjacent trees and thus creating unary nodes in those trees (:user:`petrelharp`, :user:`hfr1tze`, :user:`avabamf`, :pr:`2651`, :pr:`2938`). diff --git a/docs/development.md b/docs/development.md index 5aaa8c8ed8..b32dd88a40 100644 --- a/docs/development.md +++ b/docs/development.md @@ -1187,7 +1187,7 @@ the release looks good there, then publish the draft release on the Publishing this release will cause the github action to deploy to the [production PyPI](https://pypi.org/project/tskit/). After release, start a section in the changelog for new developments, close the -GitHub issue milestone of the release and update ROADMAP.md. +GitHub issue milestone of the release and update the python version to a `.dev`. For a major release the website (github repo tskit-dev/tskit-site) should then be updated with a notebook of new features. The benchmarks should be run as above and the `bench-results.html` updated on the website. diff --git a/python/CHANGELOG.rst b/python/CHANGELOG.rst index 0e1aa9ccc8..a2496e5b9f 100644 --- a/python/CHANGELOG.rst +++ b/python/CHANGELOG.rst @@ -1,3 +1,8 @@ +-------------------- +[0.6.1] - 2024-10-16 +-------------------- + + -------------------- [0.6.0] - 2024-10-16 -------------------- diff --git a/python/tskit/_version.py b/python/tskit/_version.py index 43b7f59a3f..393df0d2aa 100644 --- a/python/tskit/_version.py +++ b/python/tskit/_version.py @@ -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.6.0" +tskit_version = "0.6.1.dev0"