From ac95fcde04da1a0c731bc88a95a2c7b56b59ccca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Thu, 20 Apr 2017 15:45:07 +0200
Subject: [PATCH 1/4] setup.py: Use platform specifiers instead of
 extras_require

Use platform specifiers to declare dependencies that apply only to
Python 3.4 and older, rather than extras_require. The latter does not
seem to work with the current versions of setuptools, and only
the former is mentioned in the documentation.
---
 setup.py | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index e983c27..9cc322c 100644
--- a/setup.py
+++ b/setup.py
@@ -66,13 +66,8 @@ def read_file(filename):
     test_suite="tests",
     install_requires=[
         "aiohttp>=1.1",
+        "typing;python_version<'3.5'",
     ],
-    extras_require={
-        # TODO: Rich comparison in environment markers are broken in
-        # setuptools<17.1 and pip<6.
-        # ":python_version < '3.5'": ["typing"],
-        ":python_version == '3.4'": ["typing"],
-    },
     license=about["__license__"],
     classifiers=[
         "License :: OSI Approved :: Apache Software License",

From a823e173da6aec81dc414ef43c319c89555e1980 Mon Sep 17 00:00:00 2001
From: Vladimir Rutsky <vladimir@rutsky.org>
Date: Fri, 21 Apr 2017 13:38:21 +0300
Subject: [PATCH 2/4] install wheel and update setuptools/pip in Appveyor

---
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 6df2f79..012eecb 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,6 +25,7 @@ install:
   - "powershell ./install_python_and_pip.ps1"
   - "SET PATH=%PYTHON%;%PYTHON%\\Scripts;%PATH%"
   - "python --version"
+  - "pip install -U pip setuptools wheel"
   - "pip list"
   - "pip install -r requirements-dev.txt"
   - "python setup.py develop"

From 2f867e4a35b02b2be695e646d88a2a1414f6e873 Mon Sep 17 00:00:00 2001
From: Vladimir Rutsky <vladimir@rutsky.org>
Date: Fri, 21 Apr 2017 13:44:33 +0300
Subject: [PATCH 3/4] require setuptools at least 20.8.1 + update comments

---
 setup.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 5b6f7b1..c70d98b 100644
--- a/setup.py
+++ b/setup.py
@@ -50,13 +50,12 @@ def read_file(filename):
     )),
     packages=["aiohttp_cors"],
     setup_requires=[
-        # Setuptools fixed environment markers (":python_version < '3.5'")
-        # in 17.1, and pip in 6.
-        # TODO: Doesn't work due to
+        # Environment markers were implemented and stabilized in setuptools
+        # v20.8.1 (see <http://stackoverflow.com/a/32643122/391865>).
+        "setuptools>=20.8.1",
+        # If line above doesn't work, check that you have at least
+        # setuptools v19.4 (released 2016-01-16):
         # <https://github.com/pypa/setuptools/issues/141>
-        # which were fixed in setuptools 19.4 (released 2016-01-16)
-        # "pip>=6",
-        # "setuptools>=17.1",
     ] + pytest_runner,
     tests_require=[
         "pytest",

From 25cf7e2e79050296aa5bae800a18745e64487244 Mon Sep 17 00:00:00 2001
From: Vladimir Rutsky <vladimir@rutsky.org>
Date: Fri, 21 Apr 2017 13:50:11 +0300
Subject: [PATCH 4/4] update changelog

---
 CHANGES.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index dfafced..f129a9c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
 CHANGES
 =======
 
+0.5.3 (XXXX-XX-XX)
+------------------
+
+- Fix `typing` being installed on Python 3.6.
+
 0.5.2 (2017-03-28)
 ------------------