jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

whops, its supported starting with python 3.6, not python 3.5

This commit is contained in:
Ronny Pfannschmidt 2018-06-19 23:15:13 +02:00
parent abbf73ad1a
commit 603df1ea1c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
setup.py
View File

@ -73,18 +73,18 @@ def main():
environment_marker_support_level = get_environment_marker_support_level() environment_marker_support_level = get_environment_marker_support_level()
if environment_marker_support_level >= 2: if environment_marker_support_level >= 2:
install_requires.append('funcsigs;python_version<"3.0"') 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"') install_requires.append('colorama;sys_platform=="win32"')
elif environment_marker_support_level == 1: elif environment_marker_support_level == 1:
extras_require[':python_version<"3.0"'] = ["funcsigs"] 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"] extras_require[':sys_platform=="win32"'] = ["colorama"]
else: else:
if sys.platform == "win32": if sys.platform == "win32":
install_requires.append("colorama") install_requires.append("colorama")
if sys.version_info < (3, 0): if sys.version_info < (3, 0):
install_requires.append("funcsigs") install_requires.append("funcsigs")
if sys.version_info < (3, 5): if sys.version_info < (3, 6):
install_requires.append("pathlib2") install_requires.append("pathlib2")
setup( setup(

2
src/_pytest/compat.py
View File

@ -40,7 +40,7 @@ PY35 = sys.version_info[:2] >= (3, 5)
PY36 = sys.version_info[:2] >= (3, 6) PY36 = sys.version_info[:2] >= (3, 6)
MODULE_NOT_FOUND_ERROR = "ModuleNotFoundError" if PY36 else "ImportError" MODULE_NOT_FOUND_ERROR = "ModuleNotFoundError" if PY36 else "ImportError"
if PY35: if PY36:
from pathlib import Path from pathlib import Path
else: else:
from pathlib2 import Path from pathlib2 import Path