Clean up setup.py and move it into src/.

src/python/setup.py → src/python/src/setup.py

@@ -32,19 +32,17 @@
 from distutils import core as _core
 
 _EXTENSION_SOURCES = (
-    'src/_adapter/_c.c',
-    'src/_adapter/_call.c',
-    'src/_adapter/_channel.c',
-    'src/_adapter/_completion_queue.c',
-    'src/_adapter/_error.c',
-    'src/_adapter/_server.c',
-    'src/_adapter/_server_credentials.c',
+    '_adapter/_c.c',
+    '_adapter/_call.c',
+    '_adapter/_channel.c',
+    '_adapter/_completion_queue.c',
+    '_adapter/_error.c',
+    '_adapter/_server.c',
+    '_adapter/_server_credentials.c',
 )
 
 _EXTENSION_INCLUDE_DIRECTORIES = (
-    'src',
-    # TODO(nathaniel): Can this path specification be made to work?
-    #'../../include',
+    '.',
 )
 
 _EXTENSION_LIBRARIES = (
@@ -52,16 +50,11 @@ _EXTENSION_LIBRARIES = (
     'grpc',
 )
 
-_EXTENSION_LIBRARY_DIRECTORIES = (
-    # TODO(nathaniel): Can this path specification be made to work?
-    #'../../libs/dbg',
-)
-
 _EXTENSION_MODULE = _core.Extension(
     '_adapter._c', sources=list(_EXTENSION_SOURCES),
     include_dirs=_EXTENSION_INCLUDE_DIRECTORIES,
     libraries=_EXTENSION_LIBRARIES,
-    library_dirs=_EXTENSION_LIBRARY_DIRECTORIES)
+    )
 
 _PACKAGES=(
     '_adapter',
@@ -73,12 +66,14 @@ _PACKAGES=(
     '_framework.face.testing',
     '_framework.foundation',
     '_junkdrawer',
+    'grpc_early_adopter',
 )
 
 _PACKAGE_DIRECTORIES = {
-    '_adapter': 'src/_adapter',
-    '_framework': 'src/_framework',
-    '_junkdrawer': 'src/_junkdrawer',
+    '_adapter': '_adapter',
+    '_framework': '_framework',
+    '_junkdrawer': '_junkdrawer',
+    'grpc_early_adopter': 'grpc_early_adopter',
 }
 
 _core.setup(

tools/run_tests/build_python.sh

@@ -12,4 +12,4 @@ virtualenv python2.7_virtual_environment
 ln -sf $root/include/grpc python2.7_virtual_environment/include/grpc
 source python2.7_virtual_environment/bin/activate
 pip install enum34==1.0.4 futures==2.2.0 protobuf==2.6.1
-CFLAGS=-I$root/include LDFLAGS=-L$root/libs/opt pip install src/python
+CFLAGS=-I$root/include LDFLAGS=-L$root/libs/opt pip install src/python/src