From: Ben Darnell Date: Sun, 20 Feb 2011 20:16:43 +0000 (-0800) Subject: Declare dependencies in setup.py for automatic installation. X-Git-Tag: v1.2.0~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=19f850e19b4e432e0faed630b748e58069214300;p=thirdparty%2Ftornado.git Declare dependencies in setup.py for automatic installation. --- diff --git a/setup.py b/setup.py index 544b553e4..38011a057 100644 --- a/setup.py +++ b/setup.py @@ -23,10 +23,16 @@ try: except ImportError: pass -# Build the epoll extension for Linux systems with Python < 2.6 -extensions = [] major, minor = sys.version_info[:2] python_26 = (major > 2 or (major == 2 and minor >= 6)) + +requirements = ["pycurl"] +if not python_26: + # Python 2.6 includes a json module in the standard library + requirements.append("simplejson") + +# Build the epoll extension for Linux systems with Python < 2.6 +extensions = [] if "linux" in sys.platform.lower() and not python_26: extensions.append(distutils.core.Extension( "tornado.epoll", ["tornado/epoll.c"])) @@ -42,6 +48,7 @@ distutils.core.setup( "tornado.test": ["README", "test.crt", "test.key"], }, ext_modules = extensions, + install_requires = requirements, author="Facebook", author_email="python-tornado@googlegroups.com", url="http://www.tornadoweb.org/",