From 82b04165eb53f8e3320b492ddfd2b0c3ee5f70e1 Mon Sep 17 00:00:00 2001
From: Anthony Sottile <asottile@umich.edu>
Date: Fri, 8 May 2020 07:32:59 -0700
Subject: [PATCH] 2.6.0

---
 CHANGES.txt    | 12 +++++++++++-
 pycodestyle.py |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index aa2d181c..86bf47be 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,7 +1,17 @@
 Changelog
 =========
 
-2.6.0a1 (2020-04-02)
+2.6.0 (2020-05-08)
+------------------
+
+Changes:
+
+* E306: fix detection inside ``async def``.  PR #929.
+* E301: fix regression disallowing decorated one-liners.  PR #927.
+* E714: fix false positive with chained ``is not``.  PR #931.
+
+
+2.6.0a1 (2020-04-23)
 --------------------
 
 New checks:
diff --git a/pycodestyle.py b/pycodestyle.py
index 651edfb6..deb45395 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -78,7 +78,7 @@ def lru_cache(maxsize=128):  # noqa as it's a fake implementation.
 except ImportError:
     from ConfigParser import RawConfigParser
 
-__version__ = '2.6.0a1'
+__version__ = '2.6.0'
 
 DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox'
 DEFAULT_IGNORE = 'E121,E123,E126,E226,E24,E704,W503,W504'