Skip to content

Commit

Permalink
Merge pull request #3760 from RonnyPfannschmidt/fix-3757-pin-pathlib
Browse files Browse the repository at this point in the history
fix #3757 by pinning to pathlib2 that supports __fspath__
  • Loading branch information
nicoddemus authored Aug 1, 2018
2 parents 4588130 + 57a8f20 commit f256833
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions changelog/3757.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Pin pathlib2 to ``>=2.2.0`` as we require ``__fspath__`` support.
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,19 +73,19 @@ 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.6"')
install_requires.append('pathlib2>=2.2.0;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.6"'] = ["pathlib2"]
extras_require[':python_version<"3.6"'] = ["pathlib2>=2.2.0"]
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, 6):
install_requires.append("pathlib2")
install_requires.append("pathlib2>=2.2.0")

setup(
name="pytest",
Expand Down

0 comments on commit f256833

Please sign in to comment.