diff --git a/setup.py b/setup.py index 710228658..9c703cc8e 100644 --- a/setup.py +++ b/setup.py @@ -73,18 +73,18 @@ def main(): environment_marker_support_level = get_environment_marker_support_level() if environment_marker_support_level >= 2: install_requires.append('funcsigs;python_version<"3.0"') - install_requires.append('pathlib2;python_version<"3.5"') + install_requires.append('pathlib2;python_version<"3.6"') install_requires.append('colorama;sys_platform=="win32"') elif environment_marker_support_level == 1: extras_require[':python_version<"3.0"'] = ["funcsigs"] - extras_require[':python_version<"3.5"'] = ["pathlib2"] + extras_require[':python_version<"3.6"'] = ["pathlib2"] extras_require[':sys_platform=="win32"'] = ["colorama"] else: if sys.platform == "win32": install_requires.append("colorama") if sys.version_info < (3, 0): install_requires.append("funcsigs") - if sys.version_info < (3, 5): + if sys.version_info < (3, 6): install_requires.append("pathlib2") setup( diff --git a/src/_pytest/compat.py b/src/_pytest/compat.py index 01d46222d..4620f2be9 100644 --- a/src/_pytest/compat.py +++ b/src/_pytest/compat.py @@ -40,7 +40,7 @@ PY35 = sys.version_info[:2] >= (3, 5) PY36 = sys.version_info[:2] >= (3, 6) MODULE_NOT_FOUND_ERROR = "ModuleNotFoundError" if PY36 else "ImportError" -if PY35: +if PY36: from pathlib import Path else: from pathlib2 import Path