From bc840e24037ebd8c33f5d9ac223a83d229b7375f Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 15 Jan 2017 11:06:51 -0600
Subject: [PATCH 1/2] Add AST support for Python 3.6

Upgrade version constraints on PyFlakes to only the versions that handle
Python 3.6

Closes #290
---
 docs/source/release-notes/3.3.0.rst | 4 ++++
 setup.py                            | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/source/release-notes/3.3.0.rst b/docs/source/release-notes/3.3.0.rst
index dc07e7b..af62f6b 100644
--- a/docs/source/release-notes/3.3.0.rst
+++ b/docs/source/release-notes/3.3.0.rst
@@ -3,6 +3,8 @@
 
 You can view the `3.3.0 milestone`_ on GitLab for more details.
 
+- Update upper bound on PyFlakes to allow for PyFlakes 1.5.0 (`GitLab#290`_)
+
 - Add methods to Report class that will be called when Flake8 starts and
   finishes processing a file. (`GitLab#251`_)
 
@@ -26,5 +28,7 @@ You can view the `3.3.0 milestone`_ on GitLab for more details.
     https://gitlab.com/pycqa/flake8/issues/251
 .. _GitLab#268:
     https://gitlab.com/pycqa/flake8/issues/268
+.. _GitLab#290:
+    https://gitlab.com/pycqa/flake8/issues/290
 .. _GitLab!156:
     https://gitlab.com/pycqa/flake8/merge_requests/156
diff --git a/setup.py b/setup.py
index 3e71c30..033a536 100644
--- a/setup.py
+++ b/setup.py
@@ -15,7 +15,7 @@ import flake8
 tests_require = ['mock >= 2.0.0', 'pytest']
 
 requires = [
-    "pyflakes >= 0.8.1, != 1.2.0, != 1.2.1, != 1.2.2, < 1.4.0",
+    "pyflakes >= 1.5.0, < 1.6.0",
     "pycodestyle >= 2.0.0, < 2.3.0",
     "mccabe >= 0.5.0, < 0.6.0",
 ]
@@ -123,6 +123,7 @@ setuptools.setup(
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.4",
         "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Software Development :: Quality Assurance",
     ],

From 88cbf83d29782fa3d09b353692bf4df00f7d9d4a Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 15 Jan 2017 11:23:19 -0600
Subject: [PATCH 2/2] Add Python 3.6 to CI services

---
 .gitlab-ci.yml | 15 +++++++++++++--
 .travis.yml    |  2 ++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e840d40..8f99bc3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,9 +19,20 @@ python2:
   stage: test
   script: tox -e py27
 
-python3:
+python34:
+  image: python:3.4
   stage: test
-  script: tox --skip-missing-interpreters -e py34,py35
+  script: tox -e py34
+
+python35:
+  image: python:3.5
+  stage: test
+  script: tox -e py35
+
+python36:
+  image: python:3.6
+  stage: test
+  script: tox -e py36
 
 linters:
   image: python:3.5
diff --git a/.travis.yml b/.travis.yml
index 20c7c29..47173cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
       env: TOXENV=py34
     - python: 3.5
       env: TOXENV=py35
+    - python: 3.6
+      env: TOXENV=py36
     - python: pypy
       env: TOXENV=pypy
     - python: 2.7