Merge branch 'master' into 2.0

requirements.txt

@@ -2,7 +2,6 @@ jsonschema>=2.4.0
 aiohttp>=1.3.5,<=1.4.0 # pyup: ignore
 aiohttp-cors==0.5.1 # pyup: ignore
 yarl>=0.9.8,<0.10 # pyup: ignore
-typing>=3.5.3.0 # Otherwise yarl fail with python 3.4 
 Jinja2>=2.7.3
 raven>=5.23.0
 psutil>=3.0.0

setup.py

@@ -40,6 +40,9 @@ class PyTest(TestCommand):
 
 dependencies = open("requirements.txt", "r").read().splitlines()
 
+if sys.version_info <= (3, 4):
+    dependencies.append('typing>=3.5.3.0 # Otherwise yarl fail with python 3.4')
+
 setup(
     name="gns3-server",
     version=__import__("gns3server").__version__,