Merge pull request #231 from enthought/use-setuptools-feature-class

Use distribute feature class

docs/source/instructional/overview.rst

@@ -71,7 +71,11 @@ Alternatively you can work in developing mode::
     python setup.py develop
 
 Enaml ships with optional high performance C++ extensions. To build them,
-an enviroment variable must be set before running ``setup.py``
+a ``--with`` option needs to be provided::
+
+    python setup.py --with-enaml-extensions install
+
+Or an enviroment variable must be set before running ``setup.py``.
 
 On Windows::
 

setup.py

@@ -3,11 +3,13 @@
 #  All rights reserved.
 #------------------------------------------------------------------------------
 import os
-from setuptools import setup, find_packages, Extension
+from setuptools import setup, find_packages, Extension, Feature
 
 
-if os.environ.get('BUILD_ENAML_EXTENSIONS'):
-    ext_modules = [
+enaml_extensions = Feature(
+    description='optional optimized c++ extensions',
+    standard=bool(os.environ.get('BUILD_ENAML_EXTENSIONS')),
+    ext_modules=[
         Extension(
             'enaml.extensions.weakmethod',
             ['enaml/extensions/weakmethod.cpp'],
@@ -27,10 +29,9 @@
             'enaml.extensions.funchelper',
             ['enaml/extensions/funchelper.cpp'],
             language='c++',
-        ),
-    ]
-else:
-    ext_modules = []
+        )
+    ],
+)
 
 
 setup(
@@ -51,7 +52,7 @@
             'enaml-run = enaml.runner:main',
         ],
     ),
-    ext_modules=ext_modules,
     test_suite='enaml.test_collector',
+    features={'enaml-extensions': enaml_extensions}
 )