Releasing 2.6.0

jazzband · Jul 20, 2022 · c5d5646 · c5d5646
1 parent 2ec6611
commit c5d5646
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,13 @@ Waffle Changelog
 ================
 
 
+v2.6.0
+======
+- Fixed Django 4.0 compatibility
+- Added support for custom Sample and Switch models
+- Added ability to determine if flag is active without persisting new state
+- Added support for Python 3.10
+
 v2.5.0
 ======
 - Corrected error in docs

diff --git a/docs/conf.py b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.5'
+version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.0'
+release = '2.6.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='django-waffle',
-    version='2.5.0',
+    version='2.6.0',
     description='A feature flipper for Django.',
     long_description=open('README.rst').read(),
     author='James Socol',

diff --git a/waffle/__init__.py b/waffle/__init__.py
@@ -4,7 +4,7 @@
 from waffle.utils import get_setting
 from django.apps import apps as django_apps
 
-VERSION = (2, 5, 0)
+VERSION = (2, 6, 0)
 __version__ = '.'.join(map(str, VERSION))
 
 if django.VERSION < (3, 2):
@@ -29,6 +29,7 @@ def sample_is_active(sample_name):
 def get_waffle_flag_model():
     return get_waffle_model('FLAG_MODEL')
 
+
 def get_waffle_model(setting_name):
     """
     Returns the waffle Flag model that is active in this project.