From: Ben Darnell Date: Tue, 22 Feb 2011 19:00:02 +0000 (-0800) Subject: Revert "Declare dependencies in setup.py for automatic installation." X-Git-Tag: v1.2.1~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc2363a147c4deece4cd74a906fc88fe09034a48;p=thirdparty%2Ftornado.git Revert "Declare dependencies in setup.py for automatic installation." This reverts commit 19f850e19b4e432e0faed630b748e58069214300. This turned out to be more trouble than it's worth, since it doesn't interact well with external installations of pycurl (e.g. from a .deb). These dependencies are going away soon anyway. --- diff --git a/setup.py b/setup.py index 8e1550e8f..1fdb75cd4 100644 --- a/setup.py +++ b/setup.py @@ -23,16 +23,10 @@ try: except ImportError: pass -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 = [] +major, minor = sys.version_info[:2] +python_26 = (major > 2 or (major == 2 and minor >= 6)) if "linux" in sys.platform.lower() and not python_26: extensions.append(distutils.core.Extension( "tornado.epoll", ["tornado/epoll.c"])) @@ -48,7 +42,6 @@ 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/",