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

Merge pull request #5325 from asottile/temporary 

Temporarily pin pluggy on master
This commit is contained in:
Anthony Sottile 2019-05-28 09:37:04 -07:00 committed by GitHub
parent bce45052a6 2e2e895b4b
commit 81cc73103a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -115,6 +115,11 @@ matrix:
allow_failures: allow_failures:
- python: '3.8-dev' - python: '3.8-dev'
env: TOXENV=py38-xdist env: TOXENV=py38-xdist
# temporary until pytest 4.6 is released
- env: TOXENV=py27-pluggymaster-xdist
python: '2.7'
- env: TOXENV=py37-pluggymaster-xdist
before_script: before_script:
- | - |

2
setup.py
View File

@ -14,7 +14,7 @@ INSTALL_REQUIRES = [
'funcsigs>=1.0;python_version<"3.0"', 'funcsigs>=1.0;python_version<"3.0"',
'pathlib2>=2.2.0;python_version<"3.6"', 'pathlib2>=2.2.0;python_version<"3.6"',
'colorama;sys_platform=="win32"', 'colorama;sys_platform=="win32"',
"pluggy>=0.9,!=0.10,<1.0", "pluggy==0.11", # temporary until 4.6 is released
"wcwidth", "wcwidth",
] ]