Merge "Revert "Add Pillow to test-requirements.txt""

This commit is contained in:
Jenkins
2015-11-17 01:16:19 +00:00
committed by Gerrit Code Review

View File

@@ -2,11 +2,6 @@ hacking>=0.9.2,<0.10
coverage>=3.6
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
# NOTE(tonyb) Pillow isn't directly needed but it's pulled in via
# Collecting Pillow (from blockdiag>=1.5.0->sphinxcontrib-blockdiag>=0.5.5
# So cap as per global-requirements until https://launchpad.net/bugs/1501995
# is properly fixed
Pillow>=2.4.0,<3.0.0 # MIT
sphinxcontrib-blockdiag>=0.5.5
discover
fixtures>=0.3.14