Cython required for setup

aholmberg · aholmberg · commit e25035318e2b · 2015-08-13T17:06:10.000-05:00
Abandoning Cython 'extra' in favor of getting it during setup.

As an extra, there was no way of making sure it is present while the
driver build is executed.
diff --git a/setup.py b/setup.py
@@ -216,7 +216,6 @@ def run_setup(extensions):
         keywords='cassandra,cql,orm',
         include_package_data=True,
         install_requires=dependencies,
-        extras_require = {'cython': ['Cython']},
         tests_require=['nose', 'mock<=1.0.1', 'PyYAML', 'pytz', 'sure'],
         classifiers=[
             'Development Status :: 5 - Production/Stable',
@@ -260,8 +259,10 @@ def run_setup(extensions):
 if "--no-libev" not in sys.argv and not is_windows:
     extensions.append(libev_ext)
 
-if "--no-cython" not in sys.argv:
+if "--no-cython" not in sys.argv and not os.environ.get('CASS_DRIVER_NO_CYTHON'):
     try:
+        setup(setup_requires=['Cython'])
+
         from Cython.Build import cythonize
         cython_candidates = ['cluster', 'concurrent', 'connection', 'cqltypes', 'metadata',
                              'pool', 'protocol', 'query', 'util']
@@ -273,7 +274,7 @@ def run_setup(extensions):
             exclude_failures=True))
         extensions.extend(cythonize("cassandra/*.pyx"))
         extensions.extend(cythonize("tests/unit/cython/*.pyx"))
-    except ImportError:
+    except Exception:
         sys.stderr.write("Cython is not installed. Not compiling core driver files as extensions (optional).")
 
 if "--no-extensions" in sys.argv:
diff --git a/tox.ini b/tox.ini
@@ -11,7 +11,6 @@ deps = nose
 deps = {[base]deps}
        sure
        blist
-       {env:CYTHON_DEP:}
        py26: unittest2
        py{26,27}: gevent
        twisted
