summaryrefslogtreecommitdiffstats
path: root/pavement.py
diff options
context:
space:
mode:
authorGravatar zoidberg10 <zoidberg@mujmail.cz> 2011-12-08 02:08:35 +0100
committerGravatar zoidberg10 <zoidberg@mujmail.cz> 2011-12-08 02:08:35 +0100
commit30ba647fe479d86c3d7bac71908ee56ec80eb928 (patch)
tree765c5e0295d81f712e070da774d591561848f34b /pavement.py
parenthttprequest: encode('utf_8') for unicode post (diff)
parentupdated bottle.py (diff)
downloadpyload-30ba647fe479d86c3d7bac71908ee56ec80eb928.tar.xz
Merge
Diffstat (limited to 'pavement.py')
-rw-r--r--pavement.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/pavement.py b/pavement.py
index 852179e94..7f956e78d 100644
--- a/pavement.py
+++ b/pavement.py
@@ -37,13 +37,12 @@ setup(
#data_files=[],
include_package_data=True,
exclude_package_data={'pyload': ['docs*', 'scripts*']}, #exluced from build but not from sdist
- #leaving out thrift 0.8.0 since its not statisfiable
- install_requires=['BeautifulSoup>=3.2, <3.3', 'jinja2', 'pycurl', 'Beaker', 'bottle >= 0.9.0'] + extradeps,
+ install_requires=['thrift >= 0.8.0', 'jinja2', 'pycurl', 'Beaker', 'bottle >= 0.10.0', 'BeautifulSoup>=3.2, <3.3'] + extradeps,
extras_require={
'SSL': ["pyOpenSSL"],
'DLC': ['pycrypto'],
'lightweight webserver': ['bjoern'],
- 'RSS plugins': ['feedparser']
+ 'RSS plugins': ['feedparser'],
},
#setup_requires=["setuptools_hg"],
entry_points={