summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/source/release-notes/3.2.0.rst13
-rw-r--r--docs/source/release-notes/index.rst1
-rw-r--r--setup.cfg2
-rw-r--r--setup.py2
-rw-r--r--src/flake8/__init__.py2
5 files changed, 17 insertions, 3 deletions
diff --git a/docs/source/release-notes/3.2.0.rst b/docs/source/release-notes/3.2.0.rst
new file mode 100644
index 0000000..c360f64
--- /dev/null
+++ b/docs/source/release-notes/3.2.0.rst
@@ -0,0 +1,13 @@
+3.1.1 -- 2016-11-14
+-------------------
+
+You can view the `3.2.0 milestone`_ on GitLab for more details.
+
+- Allow for pycodestyle 2.2.0 which fixes a bug in E305 (See also
+ `GitLab#256`_)
+
+.. links
+.. _3.2.0 milestone:
+ https://gitlab.com/pycqa/flake8/milestones/14
+.. _GitLab#256:
+ https://gitlab.com/pycqa/flake8/issues/256
diff --git a/docs/source/release-notes/index.rst b/docs/source/release-notes/index.rst
index b85924b..4bdbed3 100644
--- a/docs/source/release-notes/index.rst
+++ b/docs/source/release-notes/index.rst
@@ -9,6 +9,7 @@ with the newest releases first.
==================
.. toctree::
+ 3.2.0
3.1.1
3.1.0
3.0.4
diff --git a/setup.cfg b/setup.cfg
index 98d3002..965d642 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,5 +9,5 @@ requires-dist =
enum34; python_version<"3.4"
configparser; python_version<"3.2"
pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0
- pycodestyle >= 2.0.0, < 2.2.0
+ pycodestyle >= 2.0.0, < 2.3.0
mccabe >= 0.5.0, < 0.6.0
diff --git a/setup.py b/setup.py
index 06ae512..dc346e1 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@ tests_require = ['mock', 'pytest']
requires = [
"pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0",
- "pycodestyle >= 2.0.0, < 2.2.0",
+ "pycodestyle >= 2.0.0, < 2.3.0",
"mccabe >= 0.5.0, < 0.6.0",
]
diff --git a/src/flake8/__init__.py b/src/flake8/__init__.py
index 78b66d1..be1b12e 100644
--- a/src/flake8/__init__.py
+++ b/src/flake8/__init__.py
@@ -27,7 +27,7 @@ LOG.addHandler(NullHandler())
# Clean up after LOG config
del NullHandler
-__version__ = '3.1.1'
+__version__ = '3.2.0'
__version_info__ = tuple(int(i) for i in __version__.split('.') if i.isdigit())