Merge pull request #2650 from srinivasreddy/2642

Fixed#2642: Convert py module references to six module
2017-08-04 09:21:51 +02:00
parent 40254b64e5 2e33d9b35e
commit 9e62a31b63
19 changed files with 61 additions and 57 deletions
@@ -43,7 +43,7 @@ def has_environment_marker_support():


 def main():
-    install_requires = ['py>=1.4.33', 'setuptools']  # pluggy is vendored in _pytest.vendored_packages
+    install_requires = ['py>=1.4.33', 'six>=1.10.0','setuptools']  # pluggy is vendored in _pytest.vendored_packages
    extras_require = {}
    if has_environment_marker_support():
        extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict']