From b8b0adfbf9399856fa40945b38a292bccebf370a Mon Sep 17 00:00:00 2001
From: Nathaniel Manista <nathaniel@google.com>
Date: Thu, 29 Jan 2015 00:30:51 +0000
Subject: [PATCH] Refactoring of the Python build.
The source code is moved from src/python to
src/python/src. A setup.py is added at
src/python. The build_python.sh and
run_python.sh scripts are updated to build
and run the Python tests by building a
package and installing it in the developer's
Python 2.7 virtual environment.
---
src/python/setup.py | 52 +++++++++++++++++++
src/python/{ => src}/__init__.py | 0
src/python/{ => src}/_framework/__init__.py | 0
.../{ => src}/_framework/base/__init__.py | 0
.../{ => src}/_framework/base/exceptions.py | 0
.../{ => src}/_framework/base/interfaces.py | 0
.../_framework/base/interfaces_test.py | 0
.../_framework/base/packets/__init__.py | 0
.../_framework/base/packets/_cancellation.py | 0
.../_framework/base/packets/_constants.py | 0
.../_framework/base/packets/_context.py | 0
.../_framework/base/packets/_emission.py | 0
.../_framework/base/packets/_ends.py | 0
.../_framework/base/packets/_expiration.py | 0
.../_framework/base/packets/_ingestion.py | 0
.../_framework/base/packets/_interfaces.py | 0
.../_framework/base/packets/_reception.py | 0
.../_framework/base/packets/_termination.py | 0
.../_framework/base/packets/_transmission.py | 0
.../base/packets/implementations.py | 0
.../base/packets/implementations_test.py | 0
.../_framework/base/packets/in_memory.py | 0
.../_framework/base/packets/interfaces.py | 0
.../{ => src}/_framework/base/packets/null.py | 0
.../_framework/base/packets/packets.py | 0
src/python/{ => src}/_framework/base/util.py | 0
.../{ => src}/_framework/common/__init__.py | 0
.../_framework/common/cardinality.py | 0
.../{ => src}/_framework/face/__init__.py | 0
.../{ => src}/_framework/face/_calls.py | 0
.../{ => src}/_framework/face/_control.py | 0
.../{ => src}/_framework/face/_service.py | 0
.../{ => src}/_framework/face/_test_case.py | 0
...blocking_invocation_inline_service_test.py | 0
.../_framework/face/demonstration.py | 0
...vocation_synchronous_event_service_test.py | 0
.../{ => src}/_framework/face/exceptions.py | 0
...ocation_asynchronous_event_service_test.py | 0
.../_framework/face/implementations.py | 0
.../{ => src}/_framework/face/interfaces.py | 0
.../_framework/face/testing/__init__.py | 0
.../_framework/face/testing/base_util.py | 0
...ing_invocation_inline_service_test_case.py | 0
.../_framework/face/testing/callback.py | 0
.../_framework/face/testing/control.py | 0
.../_framework/face/testing/coverage.py | 0
.../_framework/face/testing/digest.py | 0
...ion_synchronous_event_service_test_case.py | 0
...on_asynchronous_event_service_test_case.py | 0
.../_framework/face/testing/interfaces.py | 0
.../_framework/face/testing/serial.py | 0
.../_framework/face/testing/service.py | 0
.../_framework/face/testing/stock_service.py | 0
.../_framework/face/testing/test_case.py | 0
.../_framework/foundation/__init__.py | 0
.../_framework/foundation/_later_test.py | 0
.../foundation/_logging_pool_test.py | 0
.../_framework/foundation/_timer_future.py | 0
.../_framework/foundation/abandonment.py | 0
.../_framework/foundation/callable_util.py | 0
.../{ => src}/_framework/foundation/future.py | 0
.../{ => src}/_framework/foundation/later.py | 0
.../_framework/foundation/logging_pool.py | 0
.../{ => src}/_framework/foundation/stream.py | 0
.../_framework/foundation/stream_testing.py | 0
.../_framework/foundation/stream_util.py | 0
src/python/{ => src}/_junkdrawer/__init__.py | 0
src/python/{ => src}/_junkdrawer/stock_pb2.py | 0
tools/run_tests/build_python.sh | 2 +
tools/run_tests/run_python.sh | 10 +++-
70 files changed, 62 insertions(+), 2 deletions(-)
create mode 100644 src/python/setup.py
rename src/python/{ => src}/__init__.py (100%)
rename src/python/{ => src}/_framework/__init__.py (100%)
rename src/python/{ => src}/_framework/base/__init__.py (100%)
rename src/python/{ => src}/_framework/base/exceptions.py (100%)
rename src/python/{ => src}/_framework/base/interfaces.py (100%)
rename src/python/{ => src}/_framework/base/interfaces_test.py (100%)
rename src/python/{ => src}/_framework/base/packets/__init__.py (100%)
rename src/python/{ => src}/_framework/base/packets/_cancellation.py (100%)
rename src/python/{ => src}/_framework/base/packets/_constants.py (100%)
rename src/python/{ => src}/_framework/base/packets/_context.py (100%)
rename src/python/{ => src}/_framework/base/packets/_emission.py (100%)
rename src/python/{ => src}/_framework/base/packets/_ends.py (100%)
rename src/python/{ => src}/_framework/base/packets/_expiration.py (100%)
rename src/python/{ => src}/_framework/base/packets/_ingestion.py (100%)
rename src/python/{ => src}/_framework/base/packets/_interfaces.py (100%)
rename src/python/{ => src}/_framework/base/packets/_reception.py (100%)
rename src/python/{ => src}/_framework/base/packets/_termination.py (100%)
rename src/python/{ => src}/_framework/base/packets/_transmission.py (100%)
rename src/python/{ => src}/_framework/base/packets/implementations.py (100%)
rename src/python/{ => src}/_framework/base/packets/implementations_test.py (100%)
rename src/python/{ => src}/_framework/base/packets/in_memory.py (100%)
rename src/python/{ => src}/_framework/base/packets/interfaces.py (100%)
rename src/python/{ => src}/_framework/base/packets/null.py (100%)
rename src/python/{ => src}/_framework/base/packets/packets.py (100%)
rename src/python/{ => src}/_framework/base/util.py (100%)
rename src/python/{ => src}/_framework/common/__init__.py (100%)
rename src/python/{ => src}/_framework/common/cardinality.py (100%)
rename src/python/{ => src}/_framework/face/__init__.py (100%)
rename src/python/{ => src}/_framework/face/_calls.py (100%)
rename src/python/{ => src}/_framework/face/_control.py (100%)
rename src/python/{ => src}/_framework/face/_service.py (100%)
rename src/python/{ => src}/_framework/face/_test_case.py (100%)
rename src/python/{ => src}/_framework/face/blocking_invocation_inline_service_test.py (100%)
rename src/python/{ => src}/_framework/face/demonstration.py (100%)
rename src/python/{ => src}/_framework/face/event_invocation_synchronous_event_service_test.py (100%)
rename src/python/{ => src}/_framework/face/exceptions.py (100%)
rename src/python/{ => src}/_framework/face/future_invocation_asynchronous_event_service_test.py (100%)
rename src/python/{ => src}/_framework/face/implementations.py (100%)
rename src/python/{ => src}/_framework/face/interfaces.py (100%)
rename src/python/{ => src}/_framework/face/testing/__init__.py (100%)
rename src/python/{ => src}/_framework/face/testing/base_util.py (100%)
rename src/python/{ => src}/_framework/face/testing/blocking_invocation_inline_service_test_case.py (100%)
rename src/python/{ => src}/_framework/face/testing/callback.py (100%)
rename src/python/{ => src}/_framework/face/testing/control.py (100%)
rename src/python/{ => src}/_framework/face/testing/coverage.py (100%)
rename src/python/{ => src}/_framework/face/testing/digest.py (100%)
rename src/python/{ => src}/_framework/face/testing/event_invocation_synchronous_event_service_test_case.py (100%)
rename src/python/{ => src}/_framework/face/testing/future_invocation_asynchronous_event_service_test_case.py (100%)
rename src/python/{ => src}/_framework/face/testing/interfaces.py (100%)
rename src/python/{ => src}/_framework/face/testing/serial.py (100%)
rename src/python/{ => src}/_framework/face/testing/service.py (100%)
rename src/python/{ => src}/_framework/face/testing/stock_service.py (100%)
rename src/python/{ => src}/_framework/face/testing/test_case.py (100%)
rename src/python/{ => src}/_framework/foundation/__init__.py (100%)
rename src/python/{ => src}/_framework/foundation/_later_test.py (100%)
rename src/python/{ => src}/_framework/foundation/_logging_pool_test.py (100%)
rename src/python/{ => src}/_framework/foundation/_timer_future.py (100%)
rename src/python/{ => src}/_framework/foundation/abandonment.py (100%)
rename src/python/{ => src}/_framework/foundation/callable_util.py (100%)
rename src/python/{ => src}/_framework/foundation/future.py (100%)
rename src/python/{ => src}/_framework/foundation/later.py (100%)
rename src/python/{ => src}/_framework/foundation/logging_pool.py (100%)
rename src/python/{ => src}/_framework/foundation/stream.py (100%)
rename src/python/{ => src}/_framework/foundation/stream_testing.py (100%)
rename src/python/{ => src}/_framework/foundation/stream_util.py (100%)
rename src/python/{ => src}/_junkdrawer/__init__.py (100%)
rename src/python/{ => src}/_junkdrawer/stock_pb2.py (100%)
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
similarity index 100%
rename from src/python/__init__.py
rename to src/python/src/__init__.py
diff --git a/src/python/_framework/__init__.py b/src/python/src/_framework/__init__.py
similarity index 100%
rename from src/python/_framework/__init__.py
rename to src/python/src/_framework/__init__.py
diff --git a/src/python/_framework/base/__init__.py b/src/python/src/_framework/base/__init__.py
similarity index 100%
rename from src/python/_framework/base/__init__.py
rename to src/python/src/_framework/base/__init__.py
diff --git a/src/python/_framework/base/exceptions.py b/src/python/src/_framework/base/exceptions.py
similarity index 100%
rename from src/python/_framework/base/exceptions.py
rename to src/python/src/_framework/base/exceptions.py
diff --git a/src/python/_framework/base/interfaces.py b/src/python/src/_framework/base/interfaces.py
similarity index 100%
rename from src/python/_framework/base/interfaces.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/interfaces_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/__init__.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_cancellation.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_constants.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_context.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_emission.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_ends.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_expiration.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_ingestion.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_interfaces.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_reception.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_termination.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/_transmission.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/implementations.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/implementations_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/in_memory.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/interfaces.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/null.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/packets/packets.py
rename to 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
similarity index 100%
rename from src/python/_framework/base/util.py
rename to src/python/src/_framework/base/util.py
diff --git a/src/python/_framework/common/__init__.py b/src/python/src/_framework/common/__init__.py
similarity index 100%
rename from src/python/_framework/common/__init__.py
rename to src/python/src/_framework/common/__init__.py
diff --git a/src/python/_framework/common/cardinality.py b/src/python/src/_framework/common/cardinality.py
similarity index 100%
rename from src/python/_framework/common/cardinality.py
rename to src/python/src/_framework/common/cardinality.py
diff --git a/src/python/_framework/face/__init__.py b/src/python/src/_framework/face/__init__.py
similarity index 100%
rename from src/python/_framework/face/__init__.py
rename to src/python/src/_framework/face/__init__.py
diff --git a/src/python/_framework/face/_calls.py b/src/python/src/_framework/face/_calls.py
similarity index 100%
rename from src/python/_framework/face/_calls.py
rename to src/python/src/_framework/face/_calls.py
diff --git a/src/python/_framework/face/_control.py b/src/python/src/_framework/face/_control.py
similarity index 100%
rename from src/python/_framework/face/_control.py
rename to src/python/src/_framework/face/_control.py
diff --git a/src/python/_framework/face/_service.py b/src/python/src/_framework/face/_service.py
similarity index 100%
rename from src/python/_framework/face/_service.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/_test_case.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/blocking_invocation_inline_service_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/demonstration.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/event_invocation_synchronous_event_service_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/exceptions.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/future_invocation_asynchronous_event_service_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/implementations.py
rename to src/python/src/_framework/face/implementations.py
diff --git a/src/python/_framework/face/interfaces.py b/src/python/src/_framework/face/interfaces.py
similarity index 100%
rename from src/python/_framework/face/interfaces.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/__init__.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/base_util.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/blocking_invocation_inline_service_test_case.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/callback.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/control.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/coverage.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/digest.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/event_invocation_synchronous_event_service_test_case.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/future_invocation_asynchronous_event_service_test_case.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/interfaces.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/serial.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/service.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/stock_service.py
rename to 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
similarity index 100%
rename from src/python/_framework/face/testing/test_case.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/__init__.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/_later_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/_logging_pool_test.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/_timer_future.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/abandonment.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/callable_util.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/future.py
rename to src/python/src/_framework/foundation/future.py
diff --git a/src/python/_framework/foundation/later.py b/src/python/src/_framework/foundation/later.py
similarity index 100%
rename from src/python/_framework/foundation/later.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/logging_pool.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/stream.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/stream_testing.py
rename to 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
similarity index 100%
rename from src/python/_framework/foundation/stream_util.py
rename to src/python/src/_framework/foundation/stream_util.py
diff --git a/src/python/_junkdrawer/__init__.py b/src/python/src/_junkdrawer/__init__.py
similarity index 100%
rename from src/python/_junkdrawer/__init__.py
rename to src/python/src/_junkdrawer/__init__.py
diff --git a/src/python/_junkdrawer/stock_pb2.py b/src/python/src/_junkdrawer/stock_pb2.py
similarity index 100%
rename from src/python/_junkdrawer/stock_pb2.py
rename to 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'
--
GitLab