Commit 00689c93 authored by Jason Madden's avatar Jason Madden

Version the greenlet dependency in setup.py to the latest (which was required...

Version the greenlet dependency in setup.py to the latest (which was required by gevent 1.0.2 as well).

Remove the in-code checking for greenlet version in gevent.hub to avoid repetition (the version it was checking for was released in 2011).

Fixes #435.
parent 605f4594
......@@ -6,12 +6,6 @@ import os
import traceback
import greenlet # http://pypi.python.org/pypi/greenlet/
greenlet_version = getattr(greenlet, '__version__', None)
if greenlet_version:
greenlet_version_info = [int(x) for x in greenlet_version.split('.')]
if not greenlet_version or greenlet_version_info[:3] < [0, 3, 2]:
raise ImportError('''Your version of greenlet (%s) is too old (required >= 0.3.2)
You can get a newer version of greenlet from http://pypi.python.org/pypi/greenlet/''' % (greenlet_version, ))
from greenlet import greenlet, getcurrent, GreenletExit
......
......@@ -286,12 +286,15 @@ def read(name, *args):
except OSError:
return ''
if PYPY:
install_requires = []
else:
install_requires = ['greenlet >= 0.4.7']
# If we are running info / help commands, we don't need to build anything
if len(sys.argv) >= 2 and ('--help' in sys.argv[1:] or
sys.argv[1] in ('--help-commands', 'egg_info', '--version', 'clean')):
ext_modules = []
install_requires = [] if PYPY else ['greenlet']
include_package_data = PYPY
run_make = False
elif PYPY:
......@@ -302,7 +305,6 @@ elif PYPY:
system('cd gevent/libev && ./configure > configure_output.txt')
from gevent import corecffi
ext_modules = [corecffi.ffi.verifier.get_extension()]
install_requires = []
include_package_data = True
run_make = False
else:
......@@ -312,7 +314,6 @@ else:
sources=["gevent/gevent._semaphore.c"]),
Extension(name="gevent._util",
sources=["gevent/gevent._util.c"])]
install_requires = ['greenlet']
include_package_data = False
run_make = True
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment