70 files changed, 62 insertions, 2 deletions
diff --git a/src/python/setup.py b/src/python/setup.py
new file mode 100644
index 0000000000..26019aaf5b
--- /dev/null
+++ b/src/python/setup.py
@@ -0,0 +1,52 @@
+# Copyright 2015, Google Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+#     * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#     * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+#     * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+"""A setup module for the GRPC Python package."""
+
+from distutils import core as _core
+
+_PACKAGES=(
+    '_framework',
+    '_framework.base',
+    '_framework.base.packets',
+    '_framework.common',
+    '_framework.face',
+    '_framework.face.testing',
+    '_framework.foundation',
+    '_junkdrawer',
+)
+
+_PACKAGE_DIRECTORIES = {
+    '_framework': 'src/_framework',
+    '_junkdrawer': 'src/_junkdrawer',
+}
+
+_core.setup(
+    name='grpc', version='0.0.1', packages=_PACKAGES,
+    package_dir=_PACKAGE_DIRECTORIES)
diff --git a/src/python/__init__.py b/src/python/src/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/__init__.py
+++ b/src/python/src/__init__.py
diff --git a/src/python/_framework/__init__.py b/src/python/src/_framework/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/__init__.py
+++ b/src/python/src/_framework/__init__.py
diff --git a/src/python/_framework/base/__init__.py b/src/python/src/_framework/base/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/base/__init__.py
+++ b/src/python/src/_framework/base/__init__.py
diff --git a/src/python/_framework/base/exceptions.py b/src/python/src/_framework/base/exceptions.py
index b8f4752184..b8f4752184 100644
--- a/src/python/_framework/base/exceptions.py
+++ b/src/python/src/_framework/base/exceptions.py
diff --git a/src/python/_framework/base/interfaces.py b/src/python/src/_framework/base/interfaces.py
index de7137cbf7..de7137cbf7 100644
--- a/src/python/_framework/base/interfaces.py
+++ b/src/python/src/_framework/base/interfaces.py
diff --git a/src/python/_framework/base/interfaces_test.py b/src/python/src/_framework/base/interfaces_test.py
index 6eb07ea505..6eb07ea505 100644
--- a/src/python/_framework/base/interfaces_test.py
+++ b/src/python/src/_framework/base/interfaces_test.py
diff --git a/src/python/_framework/base/packets/__init__.py b/src/python/src/_framework/base/packets/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/base/packets/__init__.py
+++ b/src/python/src/_framework/base/packets/__init__.py
diff --git a/src/python/_framework/base/packets/_cancellation.py b/src/python/src/_framework/base/packets/_cancellation.py
index 49172d1b97..49172d1b97 100644
--- a/src/python/_framework/base/packets/_cancellation.py
+++ b/src/python/src/_framework/base/packets/_cancellation.py
diff --git a/src/python/_framework/base/packets/_constants.py b/src/python/src/_framework/base/packets/_constants.py
index 8fbdc82782..8fbdc82782 100644
--- a/src/python/_framework/base/packets/_constants.py
+++ b/src/python/src/_framework/base/packets/_constants.py
diff --git a/src/python/_framework/base/packets/_context.py b/src/python/src/_framework/base/packets/_context.py
index be390364b0..be390364b0 100644
--- a/src/python/_framework/base/packets/_context.py
+++ b/src/python/src/_framework/base/packets/_context.py
diff --git a/src/python/_framework/base/packets/_emission.py b/src/python/src/_framework/base/packets/_emission.py
index b4be5eb0ff..b4be5eb0ff 100644
--- a/src/python/_framework/base/packets/_emission.py
+++ b/src/python/src/_framework/base/packets/_emission.py
diff --git a/src/python/_framework/base/packets/_ends.py b/src/python/src/_framework/base/packets/_ends.py
index baaf5cacf9..baaf5cacf9 100644
--- a/src/python/_framework/base/packets/_ends.py
+++ b/src/python/src/_framework/base/packets/_ends.py
diff --git a/src/python/_framework/base/packets/_expiration.py b/src/python/src/_framework/base/packets/_expiration.py
index 772e15f08c..772e15f08c 100644
--- a/src/python/_framework/base/packets/_expiration.py
+++ b/src/python/src/_framework/base/packets/_expiration.py
diff --git a/src/python/_framework/base/packets/_ingestion.py b/src/python/src/_framework/base/packets/_ingestion.py
index ad5ed4cada..ad5ed4cada 100644
--- a/src/python/_framework/base/packets/_ingestion.py
+++ b/src/python/src/_framework/base/packets/_ingestion.py
diff --git a/src/python/_framework/base/packets/_interfaces.py b/src/python/src/_framework/base/packets/_interfaces.py
index 5f6c0593d0..5f6c0593d0 100644
--- a/src/python/_framework/base/packets/_interfaces.py
+++ b/src/python/src/_framework/base/packets/_interfaces.py
diff --git a/src/python/_framework/base/packets/_reception.py b/src/python/src/_framework/base/packets/_reception.py
index a2a3823d28..a2a3823d28 100644
--- a/src/python/_framework/base/packets/_reception.py
+++ b/src/python/src/_framework/base/packets/_reception.py
diff --git a/src/python/_framework/base/packets/_termination.py b/src/python/src/_framework/base/packets/_termination.py
index d586c2167b..d586c2167b 100644
--- a/src/python/_framework/base/packets/_termination.py
+++ b/src/python/src/_framework/base/packets/_termination.py
diff --git a/src/python/_framework/base/packets/_transmission.py b/src/python/src/_framework/base/packets/_transmission.py
index 006128774d..006128774d 100644
--- a/src/python/_framework/base/packets/_transmission.py
+++ b/src/python/src/_framework/base/packets/_transmission.py
diff --git a/src/python/_framework/base/packets/implementations.py b/src/python/src/_framework/base/packets/implementations.py
index 2f07054d4d..2f07054d4d 100644
--- a/src/python/_framework/base/packets/implementations.py
+++ b/src/python/src/_framework/base/packets/implementations.py
diff --git a/src/python/_framework/base/packets/implementations_test.py b/src/python/src/_framework/base/packets/implementations_test.py
index 8bb5353176..8bb5353176 100644
--- a/src/python/_framework/base/packets/implementations_test.py
+++ b/src/python/src/_framework/base/packets/implementations_test.py
diff --git a/src/python/_framework/base/packets/in_memory.py b/src/python/src/_framework/base/packets/in_memory.py
index 17daf3acf7..17daf3acf7 100644
--- a/src/python/_framework/base/packets/in_memory.py
+++ b/src/python/src/_framework/base/packets/in_memory.py
diff --git a/src/python/_framework/base/packets/interfaces.py b/src/python/src/_framework/base/packets/interfaces.py
index 99f9e87772..99f9e87772 100644
--- a/src/python/_framework/base/packets/interfaces.py
+++ b/src/python/src/_framework/base/packets/interfaces.py
diff --git a/src/python/_framework/base/packets/null.py b/src/python/src/_framework/base/packets/null.py
index 9b40a00505..9b40a00505 100644
--- a/src/python/_framework/base/packets/null.py
+++ b/src/python/src/_framework/base/packets/null.py
diff --git a/src/python/_framework/base/packets/packets.py b/src/python/src/_framework/base/packets/packets.py
index 1315ca650e..1315ca650e 100644
--- a/src/python/_framework/base/packets/packets.py
+++ b/src/python/src/_framework/base/packets/packets.py
diff --git a/src/python/_framework/base/util.py b/src/python/src/_framework/base/util.py
index 6bbd18a59a..6bbd18a59a 100644
--- a/src/python/_framework/base/util.py
+++ b/src/python/src/_framework/base/util.py
diff --git a/src/python/_framework/common/__init__.py b/src/python/src/_framework/common/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/common/__init__.py
+++ b/src/python/src/_framework/common/__init__.py
diff --git a/src/python/_framework/common/cardinality.py b/src/python/src/_framework/common/cardinality.py
index 610425e803..610425e803 100644
--- a/src/python/_framework/common/cardinality.py
+++ b/src/python/src/_framework/common/cardinality.py
diff --git a/src/python/_framework/face/__init__.py b/src/python/src/_framework/face/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/face/__init__.py
+++ b/src/python/src/_framework/face/__init__.py
diff --git a/src/python/_framework/face/_calls.py b/src/python/src/_framework/face/_calls.py
index ab58e6378b..ab58e6378b 100644
--- a/src/python/_framework/face/_calls.py
+++ b/src/python/src/_framework/face/_calls.py
diff --git a/src/python/_framework/face/_control.py b/src/python/src/_framework/face/_control.py
index 2c221321d6..2c221321d6 100644
--- a/src/python/_framework/face/_control.py
+++ b/src/python/src/_framework/face/_control.py
diff --git a/src/python/_framework/face/_service.py b/src/python/src/_framework/face/_service.py
index d758c2f148..d758c2f148 100644
--- a/src/python/_framework/face/_service.py
+++ b/src/python/src/_framework/face/_service.py
diff --git a/src/python/_framework/face/_test_case.py b/src/python/src/_framework/face/_test_case.py
index 50b55c389f..50b55c389f 100644
--- a/src/python/_framework/face/_test_case.py
+++ b/src/python/src/_framework/face/_test_case.py
diff --git a/src/python/_framework/face/blocking_invocation_inline_service_test.py b/src/python/src/_framework/face/blocking_invocation_inline_service_test.py
index 96563c94ee..96563c94ee 100644
--- a/src/python/_framework/face/blocking_invocation_inline_service_test.py
+++ b/src/python/src/_framework/face/blocking_invocation_inline_service_test.py
diff --git a/src/python/_framework/face/demonstration.py b/src/python/src/_framework/face/demonstration.py
index 501ec6b3f8..501ec6b3f8 100644
--- a/src/python/_framework/face/demonstration.py
+++ b/src/python/src/_framework/face/demonstration.py
diff --git a/src/python/_framework/face/event_invocation_synchronous_event_service_test.py b/src/python/src/_framework/face/event_invocation_synchronous_event_service_test.py
index 48e05b2478..48e05b2478 100644
--- a/src/python/_framework/face/event_invocation_synchronous_event_service_test.py
+++ b/src/python/src/_framework/face/event_invocation_synchronous_event_service_test.py
diff --git a/src/python/_framework/face/exceptions.py b/src/python/src/_framework/face/exceptions.py
index f112df70bc..f112df70bc 100644
--- a/src/python/_framework/face/exceptions.py
+++ b/src/python/src/_framework/face/exceptions.py
diff --git a/src/python/_framework/face/future_invocation_asynchronous_event_service_test.py b/src/python/src/_framework/face/future_invocation_asynchronous_event_service_test.py
index 96f5fe85d3..96f5fe85d3 100644
--- a/src/python/_framework/face/future_invocation_asynchronous_event_service_test.py
+++ b/src/python/src/_framework/face/future_invocation_asynchronous_event_service_test.py
diff --git a/src/python/_framework/face/implementations.py b/src/python/src/_framework/face/implementations.py
index 94362e2007..94362e2007 100644
--- a/src/python/_framework/face/implementations.py
+++ b/src/python/src/_framework/face/implementations.py
diff --git a/src/python/_framework/face/interfaces.py b/src/python/src/_framework/face/interfaces.py
index 0cc7c70df3..0cc7c70df3 100644
--- a/src/python/_framework/face/interfaces.py
+++ b/src/python/src/_framework/face/interfaces.py
diff --git a/src/python/_framework/face/testing/__init__.py b/src/python/src/_framework/face/testing/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/face/testing/__init__.py
+++ b/src/python/src/_framework/face/testing/__init__.py
diff --git a/src/python/_framework/face/testing/base_util.py b/src/python/src/_framework/face/testing/base_util.py
index d9ccb3af8f..d9ccb3af8f 100644
--- a/src/python/_framework/face/testing/base_util.py
+++ b/src/python/src/_framework/face/testing/base_util.py
diff --git a/src/python/_framework/face/testing/blocking_invocation_inline_service_test_case.py b/src/python/src/_framework/face/testing/blocking_invocation_inline_service_test_case.py
index 0b1a2f0bd2..0b1a2f0bd2 100644
--- a/src/python/_framework/face/testing/blocking_invocation_inline_service_test_case.py
+++ b/src/python/src/_framework/face/testing/blocking_invocation_inline_service_test_case.py
diff --git a/src/python/_framework/face/testing/callback.py b/src/python/src/_framework/face/testing/callback.py
index 7a20869abe..7a20869abe 100644
--- a/src/python/_framework/face/testing/callback.py
+++ b/src/python/src/_framework/face/testing/callback.py
diff --git a/src/python/_framework/face/testing/control.py b/src/python/src/_framework/face/testing/control.py
index 3960c4e649..3960c4e649 100644
--- a/src/python/_framework/face/testing/control.py
+++ b/src/python/src/_framework/face/testing/control.py
diff --git a/src/python/_framework/face/testing/coverage.py b/src/python/src/_framework/face/testing/coverage.py
index f3aca113fe..f3aca113fe 100644
--- a/src/python/_framework/face/testing/coverage.py
+++ b/src/python/src/_framework/face/testing/coverage.py
diff --git a/src/python/_framework/face/testing/digest.py b/src/python/src/_framework/face/testing/digest.py
index 8d1291c975..8d1291c975 100644
--- a/src/python/_framework/face/testing/digest.py
+++ b/src/python/src/_framework/face/testing/digest.py
diff --git a/src/python/_framework/face/testing/event_invocation_synchronous_event_service_test_case.py b/src/python/src/_framework/face/testing/event_invocation_synchronous_event_service_test_case.py
index dba73a9368..dba73a9368 100644
--- a/src/python/_framework/face/testing/event_invocation_synchronous_event_service_test_case.py
+++ b/src/python/src/_framework/face/testing/event_invocation_synchronous_event_service_test_case.py
diff --git a/src/python/_framework/face/testing/future_invocation_asynchronous_event_service_test_case.py b/src/python/src/_framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
index cf8b2eeb95..cf8b2eeb95 100644
--- a/src/python/_framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
+++ b/src/python/src/_framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
diff --git a/src/python/_framework/face/testing/interfaces.py b/src/python/src/_framework/face/testing/interfaces.py
index 253f6f118d..253f6f118d 100644
--- a/src/python/_framework/face/testing/interfaces.py
+++ b/src/python/src/_framework/face/testing/interfaces.py
diff --git a/src/python/_framework/face/testing/serial.py b/src/python/src/_framework/face/testing/serial.py
index 47fc5822de..47fc5822de 100644
--- a/src/python/_framework/face/testing/serial.py
+++ b/src/python/src/_framework/face/testing/serial.py
diff --git a/src/python/_framework/face/testing/service.py b/src/python/src/_framework/face/testing/service.py
index 771346ec2e..771346ec2e 100644
--- a/src/python/_framework/face/testing/service.py
+++ b/src/python/src/_framework/face/testing/service.py
diff --git a/src/python/_framework/face/testing/stock_service.py b/src/python/src/_framework/face/testing/stock_service.py
index bd82877e83..bd82877e83 100644
--- a/src/python/_framework/face/testing/stock_service.py
+++ b/src/python/src/_framework/face/testing/stock_service.py
diff --git a/src/python/_framework/face/testing/test_case.py b/src/python/src/_framework/face/testing/test_case.py
index 09b5a67f5a..09b5a67f5a 100644
--- a/src/python/_framework/face/testing/test_case.py
+++ b/src/python/src/_framework/face/testing/test_case.py
diff --git a/src/python/_framework/foundation/__init__.py b/src/python/src/_framework/foundation/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_framework/foundation/__init__.py
+++ b/src/python/src/_framework/foundation/__init__.py
diff --git a/src/python/_framework/foundation/_later_test.py b/src/python/src/_framework/foundation/_later_test.py
index fbd17a4ad9..fbd17a4ad9 100644
--- a/src/python/_framework/foundation/_later_test.py
+++ b/src/python/src/_framework/foundation/_later_test.py
diff --git a/src/python/_framework/foundation/_logging_pool_test.py b/src/python/src/_framework/foundation/_logging_pool_test.py
index f2224d80e5..f2224d80e5 100644
--- a/src/python/_framework/foundation/_logging_pool_test.py
+++ b/src/python/src/_framework/foundation/_logging_pool_test.py
diff --git a/src/python/_framework/foundation/_timer_future.py b/src/python/src/_framework/foundation/_timer_future.py
index 86bc073d56..86bc073d56 100644
--- a/src/python/_framework/foundation/_timer_future.py
+++ b/src/python/src/_framework/foundation/_timer_future.py
diff --git a/src/python/_framework/foundation/abandonment.py b/src/python/src/_framework/foundation/abandonment.py
index 960b4d06b4..960b4d06b4 100644
--- a/src/python/_framework/foundation/abandonment.py
+++ b/src/python/src/_framework/foundation/abandonment.py
diff --git a/src/python/_framework/foundation/callable_util.py b/src/python/src/_framework/foundation/callable_util.py
index 1f7546cb76..1f7546cb76 100644
--- a/src/python/_framework/foundation/callable_util.py
+++ b/src/python/src/_framework/foundation/callable_util.py
diff --git a/src/python/_framework/foundation/future.py b/src/python/src/_framework/foundation/future.py
index f00c503257..f00c503257 100644
--- a/src/python/_framework/foundation/future.py
+++ b/src/python/src/_framework/foundation/future.py
diff --git a/src/python/_framework/foundation/later.py b/src/python/src/_framework/foundation/later.py
index fc2cf578d0..fc2cf578d0 100644
--- a/src/python/_framework/foundation/later.py
+++ b/src/python/src/_framework/foundation/later.py
diff --git a/src/python/_framework/foundation/logging_pool.py b/src/python/src/_framework/foundation/logging_pool.py
index 7c7a6eebfc..7c7a6eebfc 100644
--- a/src/python/_framework/foundation/logging_pool.py
+++ b/src/python/src/_framework/foundation/logging_pool.py
diff --git a/src/python/_framework/foundation/stream.py b/src/python/src/_framework/foundation/stream.py
index 75c0cf145b..75c0cf145b 100644
--- a/src/python/_framework/foundation/stream.py
+++ b/src/python/src/_framework/foundation/stream.py
diff --git a/src/python/_framework/foundation/stream_testing.py b/src/python/src/_framework/foundation/stream_testing.py
index c1acedc5c6..c1acedc5c6 100644
--- a/src/python/_framework/foundation/stream_testing.py
+++ b/src/python/src/_framework/foundation/stream_testing.py
diff --git a/src/python/_framework/foundation/stream_util.py b/src/python/src/_framework/foundation/stream_util.py
index 3a9c043316..3a9c043316 100644
--- a/src/python/_framework/foundation/stream_util.py
+++ b/src/python/src/_framework/foundation/stream_util.py
diff --git a/src/python/_junkdrawer/__init__.py b/src/python/src/_junkdrawer/__init__.py
index e69de29bb2..e69de29bb2 100644
--- a/src/python/_junkdrawer/__init__.py
+++ b/src/python/src/_junkdrawer/__init__.py
diff --git a/src/python/_junkdrawer/stock_pb2.py b/src/python/src/_junkdrawer/stock_pb2.py
index eef18f82d6..eef18f82d6 100644
--- a/src/python/_junkdrawer/stock_pb2.py
+++ b/src/python/src/_junkdrawer/stock_pb2.py
diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh
index 6899ac7fe3..46e5797f62 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -8,3 +8,5 @@ cd $(dirname $0)/../..
 root=`pwd`
 virtualenv python2.7_virtual_environment
 python2.7_virtual_environment/bin/pip install enum34==1.0.4 futures==2.2.0
+python2.7_virtual_environment/bin/pip install third_party/protobuf/python
+python2.7_virtual_environment/bin/pip install src/python
diff --git a/tools/run_tests/run_python.sh b/tools/run_tests/run_python.sh
index ef40602eb3..e9a0168f1e 100755
--- a/tools/run_tests/run_python.sh
+++ b/tools/run_tests/run_python.sh
@@ -6,6 +6,12 @@ set -ex
 cd $(dirname $0)/../..
 
 root=`pwd`
-PYTHONPATH=third_party/protobuf/python python2.7_virtual_environment/bin/python2.7 -B -m unittest discover -s src/python -p '*.py'
-# TODO(nathaniel): Get this working again (requires 3.X-friendly protobuf)
+# TODO(issue 215): Properly itemize these in run_tests.py so that they can be parallelized.
+python2.7_virtual_environment/bin/python2.7 -B -m _framework.base.packets.implementations_test
+python2.7_virtual_environment/bin/python2.7 -B -m _framework.face.blocking_invocation_inline_service_test
+python2.7_virtual_environment/bin/python2.7 -B -m _framework.face.event_invocation_synchronous_event_service_test
+python2.7_virtual_environment/bin/python2.7 -B -m _framework.face.future_invocation_asynchronous_event_service_test
+python2.7_virtual_environment/bin/python2.7 -B -m _framework.foundation._later_test
+python2.7_virtual_environment/bin/python2.7 -B -m _framework.foundation._logging_pool_test
+# TODO(nathaniel): Get tests working under 3.4 (requires 3.X-friendly protobuf)
 # python3.4 -B -m unittest discover -s src/python -p '*.py'