Merge branch 'stable'

1 files changed, 6 insertions, 0 deletions

diff --git a/setup.py b/setup.py
index e1d71163b..edcd4d673 100644
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,9 @@ extras_require = {
     ':sys_platform=="win32"': [
         'colorama>=0.3.5',
     ],
+    ':python_version<"3.5"': [
+        'typing'
+    ],
     'websupport': [
         'sqlalchemy>=0.9',
         'whoosh>=2.0',
@@ -77,6 +80,9 @@ extras_require = {
 if sys.platform == 'win32':
     requires.append('colorama>=0.3.5')
 
+if sys.version_info < (3, 5):
+    requires.append('typing')
+
 # Provide a "compile_catalog" command that also creates the translated
 # JavaScript files if Babel is available.