Skip to content

Commit

Permalink
Auto merge of #695 - micbou:windows-psutil, r=valloric
Browse files Browse the repository at this point in the history
[READY] Exclude psutil 5.0.1 from test requirements

Last version of psutil (5.0.1) is broken on Python 3.6 and Windows 64-bit. See issue giampaolo/psutil#951. We exclude it from our test requirements. This fixes the builds with `arch=64` and `python=36` on AppVeyor.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/ycmd/695)
<!-- Reviewable:end -->
  • Loading branch information
homu committed Jan 22, 2017
2 parents 835cc39 + 5fecb72 commit 717b36a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion test_requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ WebTest >= 2.0.20
ordereddict >= 1.1
nose-exclude >= 0.4.1
unittest2 >= 1.1.0
psutil >= 3.3.0
# psutil 5.0.1 is broken on Python 3.6 and Windows 64-bit
psutil >= 3.3.0, != 5.0.1
# This needs to be kept in sync with submodule checkout in third_party
future == 0.15.2
coverage >= 4.2

0 comments on commit 717b36a

Please sign in to comment.