Skip to content

Commit

Permalink
Revert "Declare dependencies in setup.py for automatic installation."
Browse files Browse the repository at this point in the history
This reverts commit 19f850e.

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.
  • Loading branch information
bdarnell committed Feb 22, 2011
1 parent f543620 commit cc2363a
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,10 @@
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"]))
Expand All @@ -48,7 +42,6 @@
"tornado.test": ["README", "test.crt", "test.key"],
},
ext_modules = extensions,
install_requires = requirements,
author="Facebook",
author_email="[email protected]",
url="http://www.tornadoweb.org/",
Expand Down

0 comments on commit cc2363a

Please sign in to comment.