Merge 9db53bd into c1ba277

.travis.yml

@@ -17,7 +17,6 @@ before_install:
 install:
   # nose is already installed
   # numpy is already installed
-  - pip install cython
   - pip install -r dev_requirements.txt
   - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install -r requirements-2.6.txt; fi
   - pip install coveralls

enable/__init__.py

@@ -3,10 +3,11 @@
 """ A multi-platform object drawing library.
     Part of the Enable project of the Enthought Tool Suite.
 """
-
-from kiva._version import full_version as __version__
+import sys
+from ._version import full_version as __version__
 
 __requires__ = [
+    'traits',
     'traitsui',
     'PIL',
     'kiwisolver',

setup.py

@@ -33,6 +33,12 @@
 from numpy.distutils.core import setup
 
 
+setup_requires=['numpy', 'traits']
+# Cython is only necessary to build the quartz backend.
+if sys.platform == 'darwin':
+    setup_requires.append('cython')
+
+
 MAJOR = 4
 MINOR = 6
 MICRO = 0
@@ -42,6 +48,7 @@
 VERSION = '%d.%d.%d' % (MAJOR, MINOR, MICRO)
 
 
+
 # Return the git revision as a string
 def git_version():
     def _minimal_ext_cmd(cmd):
@@ -76,7 +83,7 @@ def _minimal_ext_cmd(cmd):
     return git_revision, git_count
 
 
-def write_version_py(filename='kiva/_version.py'):
+def write_version_py(filename):
     template = """\
 # THIS FILE IS GENERATED FROM ENABLE SETUP.PY
 version = '{version}'
@@ -192,7 +199,8 @@ def run(self):
 
 
 if __name__ == "__main__":
-    write_version_py()
+    write_version_py(filename='enable/_version.py')
+    write_version_py(filename='kiva/_version.py')
     from enable import __version__, __requires__
 
     # Build the full set of packages by appending any found by setuptools'
@@ -245,6 +253,6 @@ def run(self):
               'enable': ['tests/primitives/data/PngSuite/*.png'],
           },
           platforms=["Windows", "Linux", "Mac OS-X", "Unix", "Solaris"],
-          setup_requires=['cython'],
+          setup_requires=setup_requires,
           zip_safe=False,
           **config)