Merge 88df27a into caaedec

dfunckt · May 10, 2021 · f69d4d9 · f69d4d9
2 parents caaedec + 88df27a
commit f69d4d9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,14 @@
 Changelog
 =========
 
+## v3.0.0 - 2021/05/10
+
+- Dropped support for Python 2
+- Dropped support for Django versions before 2.2
+
 ## v2.2.0 - 2020/01/17
 
-- Added compatibility with Django v3.0
+- Added support for Django v3.0
 
 ## v2.1.0 - 2019/08/11
 
@@ -21,8 +26,8 @@ Changelog
 
 ## v2.0.0 - 2018/07/22
 
-- Removed support for Python 2.6 and 3.3
-- Removed support for Django versions before 1.11
+- Dropped support for Python 2.6 and 3.3
+- Dropped support for Django versions before 1.11
 - Removed ``SkipPredicate`` exception and ``skip`` method of ``Predicate``
 - Removed ``replace_rule`` and related APIs
 - Added ``set_rule`` and related APIs to safely replace a rule without having

diff --git a/README.rst b/README.rst
@@ -47,6 +47,7 @@ Table of Contents
 =================
 
 - `Requirements`_
+- `Upgrading from 2.x`_
 - `Upgrading from 1.x`_
 - `How to install`_
 
@@ -83,8 +84,9 @@ Table of Contents
 Requirements
 ============
 
-``rules`` requires Python 3.6 or newer. It can optionally integrate with
-Django, in which case requires Django 2.2 or newer.
+``rules`` requires Python 3.6 or newer. The last version to support Python 2.7
+is ``rules`` 2.2. It can optionally integrate with Django, in which case
+requires Django 2.2 or newer.
 
 *Note*: At any given moment in time, ``rules`` will maintain support for all
 currently supported Django versions, while dropping support for those versions
@@ -94,6 +96,14 @@ section on Django Project website for the current state and timeline.
 .. _Supported Versions: https://www.djangoproject.com/download/#supported-versions
 
 
+Upgrading from 2.x
+==================
+
+The are no significant changes between ``rules`` 2.x and 3.x except dropping
+support for Python 2, so before upgrading to 3.x you just need to make sure
+you're running a supported Python 3 version.
+
+
 Upgrading from 1.x
 ==================
 

diff --git a/rules/__init__.py b/rules/__init__.py
@@ -21,6 +21,6 @@
     test_rule,
 )
 
-VERSION = (2, 2, 0, "final", 1)
+VERSION = (3, 0, 0, "final", 1)
 
 default_app_config = "rules.apps.RulesConfig"