From 31c59b6c32f7dec06361d33450e0b0bf91ef8980 Mon Sep 17 00:00:00 2001 From: Johannes Mueller Date: Thu, 10 Oct 2024 19:38:50 +0200 Subject: [PATCH] Update README.md and CHANGELOG.md Signed-off-by: Johannes Mueller --- CHANGELOG.md | 2 +- README.md | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 70834f5d..632c71a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ In this file noteworthy changes of new releases of pyLife are documented since 2.0.0. -## unreleased +## pylife-2.1.2 ### New features diff --git a/README.md b/README.md index fe8830d1..0e60da9d 100644 --- a/README.md +++ b/README.md @@ -31,12 +31,15 @@ based on pyLife code. ## Status -pyLife-2.1.1 has been released. That means that for the time being we hope -that we will not introduce *breaking* changes. That does not mean that the -release is stable finished and perfect. We will do small improvements, -especially with respect to documentation in the upcoming months and release -them as 2.1.x releases. Once we have noticeable feature additions we will come -up with a 2.x.0 release. No ETA about that. +pyLife-2.1.x is the current release the you get by default. We are doing small +improvements, in the pyLife-2.1.x branch (`master`) while developing the more +vast features in the 2.2.x branch (`develop`). + +The main new features of the 2.2.x branch is about FKM functionality. As that +is quite a comprehensive addition we would need some time to get it right +before we can release it as default release. + +Once 2.2.x is released we will probably stick to a one branch development. ## Contents