From 063454853bcd4c050e813b5c85404f61734ee41f Mon Sep 17 00:00:00 2001 From: Tony Breeds Date: Sun, 25 Oct 2015 22:43:49 +1100 Subject: [PATCH] Revert "Add Pillow to test-requirements.txt" This reverts commit 47b401f9eb2a129eec11bf0f5428e00869e8ca57. Adding Pillow to *requirements.txt was a temporary way to set the upper bound to < 3.0.0 nodepool thick slaves and requirements have been fixed and devstack is fixed in the patch that this depends on. Conflicts: test-requirements.txt Change-Id: I3fc4009680ace3ba9c222aa7ad8c8ff7d6794f94 Depends-On: I2bec8cf1bfeaaa6ae329704229fdeb86d26e55c7 --- test-requirements.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/test-requirements.txt b/test-requirements.txt index 9c353746f..afafe8dbe 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,10 +8,5 @@ Pygments # At least 1.3 is required for dedent in code blocks. Capped to 1.3 to not get an automatic update to any newer versions. sphinx>=1.3,!=1.3b1,<1.4 openstackdocstheme>=1.2.3 -# NOTE(tonyb) Pillow isn't directly needed but it's pulled in via -# Collecting Pillow (from blockdiag>=1.5.0->nwdiag -# So cap as per global-requirements until https://launchpad.net/bugs/1501995 -# is properly fixed -Pillow>=2.4.0,<3.0.0 # MIT nwdiag sphinxcontrib-nwdiag