Merge pull request #423 from fernando-mc/master

Fix conflict with standard library for typing dependency

Author: nunomaduro

requirements.txt

@@ -5,7 +5,10 @@
 
 # Requirements
 requests>=2.21,<3.0
-typing>=3.6,<4.0
+
+# Typing is included in the Python standard library as of 3.5
+# See - https://docs.python.org/3/library/typing.html
+typing>=3.6,<4.0; python_version < '3.5'
 
 # Dev requirements
 -r requirements/requirements-testing.txt

setup.cfg

@@ -34,7 +34,7 @@ include_package_data = True
 packages = find:
 install_requires =
     requests>=2.21,<3.0
-    typing>=3.6,<4.0
+    typing>=3.6,<4.0;python_version<"3.5"
 python_requires = >=2.7, !=3.0.*, !=3.1.*', !=3.2.*, !=3.3.*'
 
 [options.packages.find]