summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCalum Lind <calumlind+deluge@gmail.com>2014-09-25 23:57:52 +0100
committerCalum Lind <calumlind+deluge@gmail.com>2014-09-25 23:57:52 +0100
commitbdf39c1e8945c369e7862a77810e9f3c25ca9e7f (patch)
treef591f33ce5e7f3090615a38ec691b09b6e9831e6
parent784ecb94eaed418f804071bb57a0673e3cc54b9c (diff)
downloaddeluge-bdf39c1e8945c369e7862a77810e9f3c25ca9e7f.tar.gz
deluge-bdf39c1e8945c369e7862a77810e9f3c25ca9e7f.tar.bz2
deluge-bdf39c1e8945c369e7862a77810e9f3c25ca9e7f.zip
Switch from PIL to pillow for tox and rtd
-rw-r--r--docs/rtd_requirements.txt4
-rw-r--r--tox.ini4
2 files changed, 3 insertions, 5 deletions
diff --git a/docs/rtd_requirements.txt b/docs/rtd_requirements.txt
index 688c32bfc..c8c6c8f4f 100644
--- a/docs/rtd_requirements.txt
+++ b/docs/rtd_requirements.txt
@@ -1,9 +1,7 @@
---allow-all-external
---allow-unverified PIL
twisted
pyopenssl
sphinxcontrib-napoleon
pyxdg
service_identity
-PIL
+pillow
mako
diff --git a/tox.ini b/tox.ini
index 144cfdcef..262d04751 100644
--- a/tox.ini
+++ b/tox.ini
@@ -102,7 +102,7 @@ commands = flake8 --exit-zero --max-complexity 15 deluge
[docsbase]
sitepackages = False
changedir = docs
-install_command = pip install {opts} --allow-external PIL --allow-unverified PIL {packages}
+install_command = pip install {opts} {packages}
whitelist_externals =
{[testenv]whitelist_externals}
sphinx-build
@@ -110,7 +110,7 @@ deps =
{[testenv]deps}
sphinx
sphinxcontrib-napoleon
- PIL
+ pillow
commands = sphinx-build -E -W -b html -d build/doctrees source build/html
[testenv:docs]