Merge pull request #5325 from asottile/temporary

Temporarily pin pluggy on master
2019-05-28 09:37:04 -07:00 · 2019-05-28 09:37:04 -07:00 · 81cc73103a
parent bce45052a6 2e2e895b4b
commit 81cc73103a
2 changed files with 6 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -115,6 +115,11 @@ matrix:
  allow_failures:
    - python: '3.8-dev'
      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:
  - |
--- a/setup.py
+++ b/setup.py
@ -14,7 +14,7 @@ INSTALL_REQUIRES = [
    'funcsigs>=1.0;python_version<"3.0"',
    'pathlib2>=2.2.0;python_version<"3.6"',
    'colorama;sys_platform=="win32"',
-    "pluggy>=0.9,!=0.10,<1.0",
+    "pluggy==0.11",  # temporary until 4.6 is released
    "wcwidth",
 ]