Reorganize Python packages

This is in preparation of moving all tests into a separate package to enable ease of coverage checking and testing.
lion117 · Jul 30, 2015 · fe8dc88 · fe8dc88
1 parent 772fb1e
commit fe8dc88
Show file tree

Hide file tree

Showing 170 changed files with 29 additions and 48 deletions.
diff --git a/src/python/src/.gitignore → src/python/grpcio/.gitignore b/src/python/src/.gitignore → src/python/grpcio/.gitignore
diff --git a/src/python/src/MANIFEST.in → src/python/grpcio/MANIFEST.in b/src/python/src/MANIFEST.in → src/python/grpcio/MANIFEST.in
diff --git a/src/python/src/README.rst → src/python/grpcio/README.rst b/src/python/src/README.rst → src/python/grpcio/README.rst
diff --git a/src/python/src/commands.py → src/python/grpcio/commands.py b/src/python/src/commands.py → src/python/grpcio/commands.py
@@ -43,6 +43,7 @@
 html_theme = 'sphinx_rtd_theme'
 """
 
+
 class SphinxDocumentation(setuptools.Command):
   """Command to generate documentation via sphinx."""
 

diff --git a/src/python/interop/interop/__init__.py → src/python/grpcio/grpc/__init__.py b/src/python/interop/interop/__init__.py → src/python/grpcio/grpc/__init__.py
diff --git a/src/python/src/grpc/_adapter/.gitignore → src/python/grpcio/grpc/_adapter/.gitignore b/src/python/src/grpc/_adapter/.gitignore → src/python/grpcio/grpc/_adapter/.gitignore
diff --git a/src/python/src/grpc/__init__.py → src/python/grpcio/grpc/_adapter/__init__.py b/src/python/src/grpc/__init__.py → src/python/grpcio/grpc/_adapter/__init__.py
diff --git a/...locking_invocation_inline_service_test.py → ...locking_invocation_inline_service_test.py b/...locking_invocation_inline_service_test.py → ...locking_invocation_inline_service_test.py
diff --git a/src/python/src/grpc/_adapter/_c/module.c → src/python/grpcio/grpc/_adapter/_c/module.c b/src/python/src/grpc/_adapter/_c/module.c → src/python/grpcio/grpc/_adapter/_c/module.c
diff --git a/src/python/src/grpc/_adapter/_c/types.c → src/python/grpcio/grpc/_adapter/_c/types.c b/src/python/src/grpc/_adapter/_c/types.c → src/python/grpcio/grpc/_adapter/_c/types.c
diff --git a/src/python/src/grpc/_adapter/_c/types.h → src/python/grpcio/grpc/_adapter/_c/types.h b/src/python/src/grpc/_adapter/_c/types.h → src/python/grpcio/grpc/_adapter/_c/types.h
diff --git a/src/python/src/grpc/_adapter/_c/types/call.c → ...thon/grpcio/grpc/_adapter/_c/types/call.c b/src/python/src/grpc/_adapter/_c/types/call.c → ...thon/grpcio/grpc/_adapter/_c/types/call.c
diff --git a/...thon/src/grpc/_adapter/_c/types/channel.c → ...n/grpcio/grpc/_adapter/_c/types/channel.c b/...thon/src/grpc/_adapter/_c/types/channel.c → ...n/grpcio/grpc/_adapter/_c/types/channel.c
diff --git a/...pc/_adapter/_c/types/client_credentials.c → ...pc/_adapter/_c/types/client_credentials.c b/...pc/_adapter/_c/types/client_credentials.c → ...pc/_adapter/_c/types/client_credentials.c
diff --git a/...grpc/_adapter/_c/types/completion_queue.c → ...grpc/_adapter/_c/types/completion_queue.c b/...grpc/_adapter/_c/types/completion_queue.c → ...grpc/_adapter/_c/types/completion_queue.c
diff --git a/...ython/src/grpc/_adapter/_c/types/server.c → ...on/grpcio/grpc/_adapter/_c/types/server.c b/...ython/src/grpc/_adapter/_c/types/server.c → ...on/grpcio/grpc/_adapter/_c/types/server.c
diff --git a/...pc/_adapter/_c/types/server_credentials.c → ...pc/_adapter/_c/types/server_credentials.c b/...pc/_adapter/_c/types/server_credentials.c → ...pc/_adapter/_c/types/server_credentials.c
diff --git a/src/python/src/grpc/_adapter/_c/utility.c → src/python/grpcio/grpc/_adapter/_c/utility.c b/src/python/src/grpc/_adapter/_c/utility.c → src/python/grpcio/grpc/_adapter/_c/utility.c
diff --git a/src/python/src/grpc/_adapter/_c_test.py → src/python/grpcio/grpc/_adapter/_c_test.py b/src/python/src/grpc/_adapter/_c_test.py → src/python/grpcio/grpc/_adapter/_c_test.py
diff --git a/src/python/src/grpc/_adapter/_common.py → src/python/grpcio/grpc/_adapter/_common.py b/src/python/src/grpc/_adapter/_common.py → src/python/grpcio/grpc/_adapter/_common.py
diff --git a/...ocation_synchronous_event_service_test.py → ...ocation_synchronous_event_service_test.py b/...ocation_synchronous_event_service_test.py → ...ocation_synchronous_event_service_test.py
diff --git a/...thon/src/grpc/_adapter/_face_test_case.py → ...n/grpcio/grpc/_adapter/_face_test_case.py b/...thon/src/grpc/_adapter/_face_test_case.py → ...n/grpcio/grpc/_adapter/_face_test_case.py
diff --git a/...cation_asynchronous_event_service_test.py → ...cation_asynchronous_event_service_test.py b/...cation_asynchronous_event_service_test.py → ...cation_asynchronous_event_service_test.py
diff --git a/...on/src/grpc/_adapter/_intermediary_low.py → ...grpcio/grpc/_adapter/_intermediary_low.py b/...on/src/grpc/_adapter/_intermediary_low.py → ...grpcio/grpc/_adapter/_intermediary_low.py
diff --git a/...c/grpc/_adapter/_intermediary_low_test.py → ...o/grpc/_adapter/_intermediary_low_test.py b/...c/grpc/_adapter/_intermediary_low_test.py → ...o/grpc/_adapter/_intermediary_low_test.py
diff --git a/src/python/src/grpc/_adapter/_links_test.py → ...ython/grpcio/grpc/_adapter/_links_test.py b/src/python/src/grpc/_adapter/_links_test.py → ...ython/grpcio/grpc/_adapter/_links_test.py
diff --git a/...c/grpc/_adapter/_lonely_rear_link_test.py → ...o/grpc/_adapter/_lonely_rear_link_test.py b/...c/grpc/_adapter/_lonely_rear_link_test.py → ...o/grpc/_adapter/_lonely_rear_link_test.py
diff --git a/src/python/src/grpc/_adapter/_low.py → src/python/grpcio/grpc/_adapter/_low.py b/src/python/src/grpc/_adapter/_low.py → src/python/grpcio/grpc/_adapter/_low.py
diff --git a/src/python/src/grpc/_adapter/_low_test.py → src/python/grpcio/grpc/_adapter/_low_test.py b/src/python/src/grpc/_adapter/_low_test.py → src/python/grpcio/grpc/_adapter/_low_test.py
diff --git a/...hon/src/grpc/_adapter/_proto_scenarios.py → .../grpcio/grpc/_adapter/_proto_scenarios.py b/...hon/src/grpc/_adapter/_proto_scenarios.py → .../grpcio/grpc/_adapter/_proto_scenarios.py
diff --git a/src/python/src/grpc/_adapter/_test_links.py → ...ython/grpcio/grpc/_adapter/_test_links.py b/src/python/src/grpc/_adapter/_test_links.py → ...ython/grpcio/grpc/_adapter/_test_links.py
diff --git a/src/python/src/grpc/_adapter/_types.py → src/python/grpcio/grpc/_adapter/_types.py b/src/python/src/grpc/_adapter/_types.py → src/python/grpcio/grpc/_adapter/_types.py
diff --git a/src/python/src/grpc/_adapter/fore.py → src/python/grpcio/grpc/_adapter/fore.py b/src/python/src/grpc/_adapter/fore.py → src/python/grpcio/grpc/_adapter/fore.py
diff --git a/src/python/src/grpc/_adapter/rear.py → src/python/grpcio/grpc/_adapter/rear.py b/src/python/src/grpc/_adapter/rear.py → src/python/grpcio/grpc/_adapter/rear.py
diff --git a/src/python/src/grpc/_cython/.gitignore → src/python/grpcio/grpc/_cython/.gitignore b/src/python/src/grpc/_cython/.gitignore → src/python/grpcio/grpc/_cython/.gitignore
diff --git a/src/python/src/grpc/_cython/README.rst → src/python/grpcio/grpc/_cython/README.rst b/src/python/src/grpc/_cython/README.rst → src/python/grpcio/grpc/_cython/README.rst
diff --git a/src/python/src/grpc/_cython/__init__.py → src/python/grpcio/grpc/_cython/__init__.py b/src/python/src/grpc/_cython/__init__.py → src/python/grpcio/grpc/_cython/__init__.py
diff --git a/...thon/src/grpc/_cython/_cygrpc/__init__.py → ...n/grpcio/grpc/_cython/_cygrpc/__init__.py b/...thon/src/grpc/_cython/_cygrpc/__init__.py → ...n/grpcio/grpc/_cython/_cygrpc/__init__.py
diff --git a/src/python/src/grpc/_cython/_cygrpc/call.pxd → ...thon/grpcio/grpc/_cython/_cygrpc/call.pxd b/src/python/src/grpc/_cython/_cygrpc/call.pxd → ...thon/grpcio/grpc/_cython/_cygrpc/call.pxd
diff --git a/src/python/src/grpc/_cython/_cygrpc/call.pyx → ...thon/grpcio/grpc/_cython/_cygrpc/call.pyx b/src/python/src/grpc/_cython/_cygrpc/call.pyx → ...thon/grpcio/grpc/_cython/_cygrpc/call.pyx
diff --git a/...thon/src/grpc/_cython/_cygrpc/channel.pxd → ...n/grpcio/grpc/_cython/_cygrpc/channel.pxd b/...thon/src/grpc/_cython/_cygrpc/channel.pxd → ...n/grpcio/grpc/_cython/_cygrpc/channel.pxd
diff --git a/...thon/src/grpc/_cython/_cygrpc/channel.pyx → ...n/grpcio/grpc/_cython/_cygrpc/channel.pyx b/...thon/src/grpc/_cython/_cygrpc/channel.pyx → ...n/grpcio/grpc/_cython/_cygrpc/channel.pyx
diff --git a/...grpc/_cython/_cygrpc/completion_queue.pxd → ...grpc/_cython/_cygrpc/completion_queue.pxd b/...grpc/_cython/_cygrpc/completion_queue.pxd → ...grpc/_cython/_cygrpc/completion_queue.pxd
diff --git a/...grpc/_cython/_cygrpc/completion_queue.pyx → ...grpc/_cython/_cygrpc/completion_queue.pyx b/...grpc/_cython/_cygrpc/completion_queue.pyx → ...grpc/_cython/_cygrpc/completion_queue.pyx
diff --git a/.../src/grpc/_cython/_cygrpc/credentials.pxd → ...pcio/grpc/_cython/_cygrpc/credentials.pxd b/.../src/grpc/_cython/_cygrpc/credentials.pxd → ...pcio/grpc/_cython/_cygrpc/credentials.pxd
diff --git a/.../src/grpc/_cython/_cygrpc/credentials.pyx → ...pcio/grpc/_cython/_cygrpc/credentials.pyx b/.../src/grpc/_cython/_cygrpc/credentials.pyx → ...pcio/grpc/_cython/_cygrpc/credentials.pyx
diff --git a/src/python/src/grpc/_cython/_cygrpc/grpc.pxd → ...thon/grpcio/grpc/_cython/_cygrpc/grpc.pxd b/src/python/src/grpc/_cython/_cygrpc/grpc.pxd → ...thon/grpcio/grpc/_cython/_cygrpc/grpc.pxd
diff --git a/...thon/src/grpc/_cython/_cygrpc/records.pxd → ...n/grpcio/grpc/_cython/_cygrpc/records.pxd b/...thon/src/grpc/_cython/_cygrpc/records.pxd → ...n/grpcio/grpc/_cython/_cygrpc/records.pxd
diff --git a/...thon/src/grpc/_cython/_cygrpc/records.pyx → ...n/grpcio/grpc/_cython/_cygrpc/records.pyx b/...thon/src/grpc/_cython/_cygrpc/records.pyx → ...n/grpcio/grpc/_cython/_cygrpc/records.pyx
diff --git a/...ython/src/grpc/_cython/_cygrpc/server.pxd → ...on/grpcio/grpc/_cython/_cygrpc/server.pxd b/...ython/src/grpc/_cython/_cygrpc/server.pxd → ...on/grpcio/grpc/_cython/_cygrpc/server.pxd
diff --git a/...ython/src/grpc/_cython/_cygrpc/server.pyx → ...on/grpcio/grpc/_cython/_cygrpc/server.pyx b/...ython/src/grpc/_cython/_cygrpc/server.pyx → ...on/grpcio/grpc/_cython/_cygrpc/server.pyx
diff --git a/src/python/src/grpc/_cython/adapter_low.py → ...python/grpcio/grpc/_cython/adapter_low.py b/src/python/src/grpc/_cython/adapter_low.py → ...python/grpcio/grpc/_cython/adapter_low.py
diff --git a/...thon/src/grpc/_cython/adapter_low_test.py → ...n/grpcio/grpc/_cython/adapter_low_test.py b/...thon/src/grpc/_cython/adapter_low_test.py → ...n/grpcio/grpc/_cython/adapter_low_test.py
diff --git a/src/python/src/grpc/_cython/cygrpc.pyx → src/python/grpcio/grpc/_cython/cygrpc.pyx b/src/python/src/grpc/_cython/cygrpc.pyx → src/python/grpcio/grpc/_cython/cygrpc.pyx
diff --git a/src/python/src/grpc/_cython/cygrpc_test.py → ...python/grpcio/grpc/_cython/cygrpc_test.py b/src/python/src/grpc/_cython/cygrpc_test.py → ...python/grpcio/grpc/_cython/cygrpc_test.py
diff --git a/...python/src/grpc/_cython/test_utilities.py → ...hon/grpcio/grpc/_cython/test_utilities.py b/...python/src/grpc/_cython/test_utilities.py → ...hon/grpcio/grpc/_cython/test_utilities.py
diff --git a/src/python/src/grpc/_adapter/__init__.py → ...ython/grpcio/grpc/_junkdrawer/__init__.py b/src/python/src/grpc/_adapter/__init__.py → ...ython/grpcio/grpc/_junkdrawer/__init__.py
diff --git a/src/python/src/grpc/_junkdrawer/math_pb2.py → ...ython/grpcio/grpc/_junkdrawer/math_pb2.py b/src/python/src/grpc/_junkdrawer/math_pb2.py → ...ython/grpcio/grpc/_junkdrawer/math_pb2.py
diff --git a/src/python/src/grpc/_junkdrawer/stock_pb2.py → ...thon/grpcio/grpc/_junkdrawer/stock_pb2.py b/src/python/src/grpc/_junkdrawer/stock_pb2.py → ...thon/grpcio/grpc/_junkdrawer/stock_pb2.py
diff --git a/src/python/src/grpc/_junkdrawer/__init__.py → src/python/grpcio/grpc/_links/__init__.py b/src/python/src/grpc/_junkdrawer/__init__.py → src/python/grpcio/grpc/_links/__init__.py
diff --git a/...pc/_links/_lonely_invocation_link_test.py → ...pc/_links/_lonely_invocation_link_test.py b/...pc/_links/_lonely_invocation_link_test.py → ...pc/_links/_lonely_invocation_link_test.py
diff --git a/...ython/src/grpc/_links/_proto_scenarios.py → ...on/grpcio/grpc/_links/_proto_scenarios.py b/...ython/src/grpc/_links/_proto_scenarios.py → ...on/grpcio/grpc/_links/_proto_scenarios.py
diff --git a/...hon/src/grpc/_links/_transmission_test.py → .../grpcio/grpc/_links/_transmission_test.py b/...hon/src/grpc/_links/_transmission_test.py → .../grpcio/grpc/_links/_transmission_test.py
diff --git a/src/python/src/grpc/_links/invocation.py → src/python/grpcio/grpc/_links/invocation.py b/src/python/src/grpc/_links/invocation.py → src/python/grpcio/grpc/_links/invocation.py
diff --git a/src/python/src/grpc/_links/service.py → src/python/grpcio/grpc/_links/service.py b/src/python/src/grpc/_links/service.py → src/python/grpcio/grpc/_links/service.py
diff --git a/src/python/src/grpc/_links/__init__.py → ...hon/grpcio/grpc/early_adopter/__init__.py b/src/python/src/grpc/_links/__init__.py → ...hon/grpcio/grpc/early_adopter/__init__.py
diff --git a/...src/grpc/early_adopter/implementations.py → ...cio/grpc/early_adopter/implementations.py b/...src/grpc/early_adopter/implementations.py → ...cio/grpc/early_adopter/implementations.py
diff --git a/...rpc/early_adopter/implementations_test.py → ...rpc/early_adopter/implementations_test.py b/...rpc/early_adopter/implementations_test.py → ...rpc/early_adopter/implementations_test.py
diff --git a/...python/src/grpc/early_adopter/__init__.py → src/python/grpcio/grpc/framework/__init__.py b/...python/src/grpc/early_adopter/__init__.py → src/python/grpcio/grpc/framework/__init__.py
diff --git a/...thon/src/grpc/framework/alpha/__init__.py → ...n/grpcio/grpc/framework/alpha/__init__.py b/...thon/src/grpc/framework/alpha/__init__.py → ...n/grpcio/grpc/framework/alpha/__init__.py
diff --git a/...c/grpc/framework/alpha/_face_utilities.py → ...o/grpc/framework/alpha/_face_utilities.py b/...c/grpc/framework/alpha/_face_utilities.py → ...o/grpc/framework/alpha/_face_utilities.py
diff --git a/...hon/src/grpc/framework/alpha/_reexport.py → .../grpcio/grpc/framework/alpha/_reexport.py b/...hon/src/grpc/framework/alpha/_reexport.py → .../grpcio/grpc/framework/alpha/_reexport.py
diff --git a/...on/src/grpc/framework/alpha/exceptions.py → ...grpcio/grpc/framework/alpha/exceptions.py b/...on/src/grpc/framework/alpha/exceptions.py → ...grpcio/grpc/framework/alpha/exceptions.py
diff --git a/...on/src/grpc/framework/alpha/interfaces.py → ...grpcio/grpc/framework/alpha/interfaces.py b/...on/src/grpc/framework/alpha/interfaces.py → ...grpcio/grpc/framework/alpha/interfaces.py
diff --git a/...hon/src/grpc/framework/alpha/utilities.py → .../grpcio/grpc/framework/alpha/utilities.py b/...hon/src/grpc/framework/alpha/utilities.py → .../grpcio/grpc/framework/alpha/utilities.py
diff --git a/src/python/src/grpc/framework/__init__.py → ...on/grpcio/grpc/framework/base/__init__.py b/src/python/src/grpc/framework/__init__.py → ...on/grpcio/grpc/framework/base/__init__.py
diff --git a/.../src/grpc/framework/base/_cancellation.py → ...pcio/grpc/framework/base/_cancellation.py b/.../src/grpc/framework/base/_cancellation.py → ...pcio/grpc/framework/base/_cancellation.py
diff --git a/...hon/src/grpc/framework/base/_constants.py → .../grpcio/grpc/framework/base/_constants.py b/...hon/src/grpc/framework/base/_constants.py → .../grpcio/grpc/framework/base/_constants.py
diff --git a/...ython/src/grpc/framework/base/_context.py → ...on/grpcio/grpc/framework/base/_context.py b/...ython/src/grpc/framework/base/_context.py → ...on/grpcio/grpc/framework/base/_context.py
diff --git a/...thon/src/grpc/framework/base/_emission.py → ...n/grpcio/grpc/framework/base/_emission.py b/...thon/src/grpc/framework/base/_emission.py → ...n/grpcio/grpc/framework/base/_emission.py
diff --git a/src/python/src/grpc/framework/base/_ends.py → ...ython/grpcio/grpc/framework/base/_ends.py b/src/python/src/grpc/framework/base/_ends.py → ...ython/grpcio/grpc/framework/base/_ends.py
diff --git a/...on/src/grpc/framework/base/_expiration.py → ...grpcio/grpc/framework/base/_expiration.py b/...on/src/grpc/framework/base/_expiration.py → ...grpcio/grpc/framework/base/_expiration.py
diff --git a/...hon/src/grpc/framework/base/_ingestion.py → .../grpcio/grpc/framework/base/_ingestion.py b/...hon/src/grpc/framework/base/_ingestion.py → .../grpcio/grpc/framework/base/_ingestion.py
diff --git a/...on/src/grpc/framework/base/_interfaces.py → ...grpcio/grpc/framework/base/_interfaces.py b/...on/src/grpc/framework/base/_interfaces.py → ...grpcio/grpc/framework/base/_interfaces.py
diff --git a/...hon/src/grpc/framework/base/_reception.py → .../grpcio/grpc/framework/base/_reception.py b/...hon/src/grpc/framework/base/_reception.py → .../grpcio/grpc/framework/base/_reception.py
diff --git a/...n/src/grpc/framework/base/_termination.py → ...rpcio/grpc/framework/base/_termination.py b/...n/src/grpc/framework/base/_termination.py → ...rpcio/grpc/framework/base/_termination.py
diff --git a/.../src/grpc/framework/base/_transmission.py → ...pcio/grpc/framework/base/_transmission.py b/.../src/grpc/framework/base/_transmission.py → ...pcio/grpc/framework/base/_transmission.py
diff --git a/...hon/src/grpc/framework/base/exceptions.py → .../grpcio/grpc/framework/base/exceptions.py b/...hon/src/grpc/framework/base/exceptions.py → .../grpcio/grpc/framework/base/exceptions.py
diff --git a/...rc/grpc/framework/base/implementations.py → ...io/grpc/framework/base/implementations.py b/...rc/grpc/framework/base/implementations.py → ...io/grpc/framework/base/implementations.py
diff --git a/...pc/framework/base/implementations_test.py → ...pc/framework/base/implementations_test.py b/...pc/framework/base/implementations_test.py → ...pc/framework/base/implementations_test.py
diff --git a/...thon/src/grpc/framework/base/in_memory.py → ...n/grpcio/grpc/framework/base/in_memory.py b/...thon/src/grpc/framework/base/in_memory.py → ...n/grpcio/grpc/framework/base/in_memory.py
diff --git a/...hon/src/grpc/framework/base/interfaces.py → .../grpcio/grpc/framework/base/interfaces.py b/...hon/src/grpc/framework/base/interfaces.py → .../grpcio/grpc/framework/base/interfaces.py
diff --git a/...pc/framework/base/interfaces_test_case.py → ...pc/framework/base/interfaces_test_case.py b/...pc/framework/base/interfaces_test_case.py → ...pc/framework/base/interfaces_test_case.py
diff --git a/src/python/src/grpc/framework/base/null.py → ...python/grpcio/grpc/framework/base/null.py b/src/python/src/grpc/framework/base/null.py → ...python/grpcio/grpc/framework/base/null.py
diff --git a/src/python/src/grpc/framework/base/util.py → ...python/grpcio/grpc/framework/base/util.py b/src/python/src/grpc/framework/base/util.py → ...python/grpcio/grpc/framework/base/util.py
diff --git a/...ython/src/grpc/framework/base/__init__.py → .../grpcio/grpc/framework/common/__init__.py b/...ython/src/grpc/framework/base/__init__.py → .../grpcio/grpc/framework/common/__init__.py
diff --git a/.../src/grpc/framework/common/cardinality.py → ...pcio/grpc/framework/common/cardinality.py b/.../src/grpc/framework/common/cardinality.py → ...pcio/grpc/framework/common/cardinality.py
diff --git a/...python/src/grpc/framework/common/style.py → ...hon/grpcio/grpc/framework/common/style.py b/...python/src/grpc/framework/common/style.py → ...hon/grpcio/grpc/framework/common/style.py
diff --git a/...c/grpc/framework/common/test_constants.py → ...o/grpc/framework/common/test_constants.py b/...c/grpc/framework/common/test_constants.py → ...o/grpc/framework/common/test_constants.py
diff --git a/...src/grpc/framework/common/test_control.py → ...cio/grpc/framework/common/test_control.py b/...src/grpc/framework/common/test_control.py → ...cio/grpc/framework/common/test_control.py
diff --git a/...rc/grpc/framework/common/test_coverage.py → ...io/grpc/framework/common/test_coverage.py b/...rc/grpc/framework/common/test_coverage.py → ...io/grpc/framework/common/test_coverage.py
diff --git a/...hon/src/grpc/framework/common/__init__.py → ...on/grpcio/grpc/framework/face/__init__.py b/...hon/src/grpc/framework/common/__init__.py → ...on/grpcio/grpc/framework/face/__init__.py
diff --git a/src/python/src/grpc/framework/face/_calls.py → ...thon/grpcio/grpc/framework/face/_calls.py b/src/python/src/grpc/framework/face/_calls.py → ...thon/grpcio/grpc/framework/face/_calls.py
diff --git a/...ython/src/grpc/framework/face/_control.py → ...on/grpcio/grpc/framework/face/_control.py b/...ython/src/grpc/framework/face/_control.py → ...on/grpcio/grpc/framework/face/_control.py
diff --git a/...ython/src/grpc/framework/face/_service.py → ...on/grpcio/grpc/framework/face/_service.py b/...ython/src/grpc/framework/face/_service.py → ...on/grpcio/grpc/framework/face/_service.py
diff --git a/...hon/src/grpc/framework/face/_test_case.py → .../grpcio/grpc/framework/face/_test_case.py b/...hon/src/grpc/framework/face/_test_case.py → .../grpcio/grpc/framework/face/_test_case.py
diff --git a/...locking_invocation_inline_service_test.py → ...locking_invocation_inline_service_test.py b/...locking_invocation_inline_service_test.py → ...locking_invocation_inline_service_test.py
diff --git a/.../src/grpc/framework/face/demonstration.py → ...pcio/grpc/framework/face/demonstration.py b/.../src/grpc/framework/face/demonstration.py → ...pcio/grpc/framework/face/demonstration.py
diff --git a/...ocation_synchronous_event_service_test.py → ...ocation_synchronous_event_service_test.py b/...ocation_synchronous_event_service_test.py → ...ocation_synchronous_event_service_test.py
diff --git a/...hon/src/grpc/framework/face/exceptions.py → .../grpcio/grpc/framework/face/exceptions.py b/...hon/src/grpc/framework/face/exceptions.py → .../grpcio/grpc/framework/face/exceptions.py
diff --git a/...cation_asynchronous_event_service_test.py → ...cation_asynchronous_event_service_test.py b/...cation_asynchronous_event_service_test.py → ...cation_asynchronous_event_service_test.py
diff --git a/...rc/grpc/framework/face/implementations.py → ...io/grpc/framework/face/implementations.py b/...rc/grpc/framework/face/implementations.py → ...io/grpc/framework/face/implementations.py
diff --git a/...hon/src/grpc/framework/face/interfaces.py → .../grpcio/grpc/framework/face/interfaces.py b/...hon/src/grpc/framework/face/interfaces.py → .../grpcio/grpc/framework/face/interfaces.py
diff --git a/...ython/src/grpc/framework/face/__init__.py → ...o/grpc/framework/face/testing/__init__.py b/...ython/src/grpc/framework/face/__init__.py → ...o/grpc/framework/face/testing/__init__.py
diff --git a/.../grpc/framework/face/testing/base_util.py → .../grpc/framework/face/testing/base_util.py b/.../grpc/framework/face/testing/base_util.py → .../grpc/framework/face/testing/base_util.py
diff --git a/...ng_invocation_inline_service_test_case.py → ...ng_invocation_inline_service_test_case.py b/...ng_invocation_inline_service_test_case.py → ...ng_invocation_inline_service_test_case.py
diff --git a/...c/grpc/framework/face/testing/callback.py → ...o/grpc/framework/face/testing/callback.py b/...c/grpc/framework/face/testing/callback.py → ...o/grpc/framework/face/testing/callback.py
diff --git a/...rc/grpc/framework/face/testing/control.py → ...io/grpc/framework/face/testing/control.py b/...rc/grpc/framework/face/testing/control.py → ...io/grpc/framework/face/testing/control.py
diff --git a/...c/grpc/framework/face/testing/coverage.py → ...o/grpc/framework/face/testing/coverage.py b/...c/grpc/framework/face/testing/coverage.py → ...o/grpc/framework/face/testing/coverage.py
diff --git a/...src/grpc/framework/face/testing/digest.py → ...cio/grpc/framework/face/testing/digest.py b/...src/grpc/framework/face/testing/digest.py → ...cio/grpc/framework/face/testing/digest.py
diff --git a/...on_synchronous_event_service_test_case.py → ...on_synchronous_event_service_test_case.py b/...on_synchronous_event_service_test_case.py → ...on_synchronous_event_service_test_case.py
diff --git a/...n_asynchronous_event_service_test_case.py → ...n_asynchronous_event_service_test_case.py b/...n_asynchronous_event_service_test_case.py → ...n_asynchronous_event_service_test_case.py
diff --git a/...grpc/framework/face/testing/interfaces.py → ...grpc/framework/face/testing/interfaces.py b/...grpc/framework/face/testing/interfaces.py → ...grpc/framework/face/testing/interfaces.py
diff --git a/...src/grpc/framework/face/testing/serial.py → ...cio/grpc/framework/face/testing/serial.py b/...src/grpc/framework/face/testing/serial.py → ...cio/grpc/framework/face/testing/serial.py
diff --git a/...rc/grpc/framework/face/testing/service.py → ...io/grpc/framework/face/testing/service.py b/...rc/grpc/framework/face/testing/service.py → ...io/grpc/framework/face/testing/service.py
diff --git a/...c/framework/face/testing/stock_service.py → ...c/framework/face/testing/stock_service.py b/...c/framework/face/testing/stock_service.py → ...c/framework/face/testing/stock_service.py
diff --git a/.../grpc/framework/face/testing/test_case.py → .../grpc/framework/face/testing/test_case.py b/.../grpc/framework/face/testing/test_case.py → .../grpc/framework/face/testing/test_case.py
diff --git a/...thon/src/grpc/framework/face/utilities.py → ...n/grpcio/grpc/framework/face/utilities.py b/...thon/src/grpc/framework/face/utilities.py → ...n/grpcio/grpc/framework/face/utilities.py
diff --git a/...c/grpc/framework/face/testing/__init__.py → ...cio/grpc/framework/foundation/__init__.py b/...c/grpc/framework/face/testing/__init__.py → ...cio/grpc/framework/foundation/__init__.py
diff --git a/.../grpc/framework/foundation/_later_test.py → .../grpc/framework/foundation/_later_test.py b/.../grpc/framework/foundation/_later_test.py → .../grpc/framework/foundation/_later_test.py
diff --git a/...ramework/foundation/_logging_pool_test.py → ...ramework/foundation/_logging_pool_test.py b/...ramework/foundation/_logging_pool_test.py → ...ramework/foundation/_logging_pool_test.py
diff --git a/...rpc/framework/foundation/_timer_future.py → ...rpc/framework/foundation/_timer_future.py b/...rpc/framework/foundation/_timer_future.py → ...rpc/framework/foundation/_timer_future.py
diff --git a/.../grpc/framework/foundation/abandonment.py → .../grpc/framework/foundation/abandonment.py b/.../grpc/framework/foundation/abandonment.py → .../grpc/framework/foundation/abandonment.py
diff --git a/...rc/grpc/framework/foundation/activated.py → ...io/grpc/framework/foundation/activated.py b/...rc/grpc/framework/foundation/activated.py → ...io/grpc/framework/foundation/activated.py
diff --git a/...rpc/framework/foundation/callable_util.py → ...rpc/framework/foundation/callable_util.py b/...rpc/framework/foundation/callable_util.py → ...rpc/framework/foundation/callable_util.py
diff --git a/...n/src/grpc/framework/foundation/future.py → ...rpcio/grpc/framework/foundation/future.py b/...n/src/grpc/framework/foundation/future.py → ...rpcio/grpc/framework/foundation/future.py
diff --git a/...on/src/grpc/framework/foundation/later.py → ...grpcio/grpc/framework/foundation/later.py b/...on/src/grpc/framework/foundation/later.py → ...grpcio/grpc/framework/foundation/later.py
diff --git a/...grpc/framework/foundation/logging_pool.py → ...grpc/framework/foundation/logging_pool.py b/...grpc/framework/foundation/logging_pool.py → ...grpc/framework/foundation/logging_pool.py
diff --git a/...on/src/grpc/framework/foundation/relay.py → ...grpcio/grpc/framework/foundation/relay.py b/...on/src/grpc/framework/foundation/relay.py → ...grpcio/grpc/framework/foundation/relay.py
diff --git a/...n/src/grpc/framework/foundation/stream.py → ...rpcio/grpc/framework/foundation/stream.py b/...n/src/grpc/framework/foundation/stream.py → ...rpcio/grpc/framework/foundation/stream.py
diff --git a/...pc/framework/foundation/stream_testing.py → ...pc/framework/foundation/stream_testing.py b/...pc/framework/foundation/stream_testing.py → ...pc/framework/foundation/stream_testing.py
diff --git a/.../grpc/framework/foundation/stream_util.py → .../grpc/framework/foundation/stream_util.py b/.../grpc/framework/foundation/stream_util.py → .../grpc/framework/foundation/stream_util.py
diff --git a/...src/grpc/framework/foundation/__init__.py → ...cio/grpc/framework/interfaces/__init__.py b/...src/grpc/framework/foundation/__init__.py → ...cio/grpc/framework/interfaces/__init__.py
diff --git a/...src/grpc/framework/interfaces/__init__.py → ...pc/framework/interfaces/links/__init__.py b/...src/grpc/framework/interfaces/__init__.py → ...pc/framework/interfaces/links/__init__.py
diff --git a/.../grpc/framework/interfaces/links/links.py → .../grpc/framework/interfaces/links/links.py b/.../grpc/framework/interfaces/links/links.py → .../grpc/framework/interfaces/links/links.py
diff --git a/.../framework/interfaces/links/test_cases.py → .../framework/interfaces/links/test_cases.py b/.../framework/interfaces/links/test_cases.py → .../framework/interfaces/links/test_cases.py
diff --git a/...mework/interfaces/links/test_utilities.py → ...mework/interfaces/links/test_utilities.py b/...mework/interfaces/links/test_utilities.py → ...mework/interfaces/links/test_utilities.py
diff --git a/...c/framework/interfaces/links/utilities.py → ...c/framework/interfaces/links/utilities.py b/...c/framework/interfaces/links/utilities.py → ...c/framework/interfaces/links/utilities.py
diff --git a/src/python/src/setup.cfg → src/python/grpcio/setup.cfg b/src/python/src/setup.cfg → src/python/grpcio/setup.cfg
diff --git a/src/python/src/setup.py → src/python/grpcio/setup.py b/src/python/src/setup.py → src/python/grpcio/setup.py
@@ -79,29 +79,11 @@
 _EXTENSION_MODULES = [_C_EXTENSION_MODULE]
 
 _PACKAGES = (
-    'grpc',
-    'grpc._adapter',
-    'grpc._junkdrawer',
-    'grpc._links',
-    'grpc.early_adopter',
-    'grpc.framework',
-    'grpc.framework.alpha',
-    'grpc.framework.base',
-    'grpc.framework.common',
-    'grpc.framework.face',
-    'grpc.framework.face.testing',
-    'grpc.framework.foundation',
-    'grpc.framework.interfaces',
-    'grpc.framework.interfaces.links',
+    setuptools.find_packages('.', exclude=['*._cython', '*._cython.*'])
 )
 
 _PACKAGE_DIRECTORIES = {
-    'grpc': 'grpc',
-    'grpc._adapter': 'grpc/_adapter',
-    'grpc._junkdrawer': 'grpc/_junkdrawer',
-    'grpc._links': 'grpc/_links',
-    'grpc.early_adopter': 'grpc/early_adopter',
-    'grpc.framework': 'grpc/framework',
+    '': '.',
 }
 
 _INSTALL_REQUIRES = (

diff --git a/...pc/framework/interfaces/links/__init__.py → ...thon/grpcio_test/grpc_interop/__init__.py b/...pc/framework/interfaces/links/__init__.py → ...thon/grpcio_test/grpc_interop/__init__.py
diff --git a/...interop/interop/_insecure_interop_test.py → ...st/grpc_interop/_insecure_interop_test.py b/...interop/interop/_insecure_interop_test.py → ...st/grpc_interop/_insecure_interop_test.py
@@ -33,8 +33,8 @@
 
 from grpc.early_adopter import implementations
 
-from interop import _interop_test_case
-from interop import methods
+from grpc_interop import _interop_test_case
+from grpc_interop import methods
 
 
 class InsecureInteropTest(

diff --git a/...hon/interop/interop/_interop_test_case.py → ...o_test/grpc_interop/_interop_test_case.py b/...hon/interop/interop/_interop_test_case.py → ...o_test/grpc_interop/_interop_test_case.py
@@ -29,7 +29,7 @@
 
 """Common code for unit tests of the interoperability test code."""
 
-from interop import methods
+from grpc_interop import methods
 
 
 class InteropTestCase(object):

diff --git a/...n/interop/interop/_secure_interop_test.py → ...test/grpc_interop/_secure_interop_test.py b/...n/interop/interop/_secure_interop_test.py → ...test/grpc_interop/_secure_interop_test.py
@@ -33,9 +33,9 @@
 
 from grpc.early_adopter import implementations
 
-from interop import _interop_test_case
-from interop import methods
-from interop import resources
+from grpc_interop import _interop_test_case
+from grpc_interop import methods
+from grpc_interop import resources
 
 _SERVER_HOST_OVERRIDE = 'foo.test.google.fr'
 

diff --git a/src/python/interop/interop/client.py → ...python/grpcio_test/grpc_interop/client.py b/src/python/interop/interop/client.py → ...python/grpcio_test/grpc_interop/client.py
@@ -34,8 +34,8 @@
 
 from grpc.early_adopter import implementations
 
-from interop import methods
-from interop import resources
+from grpc_interop import methods
+from grpc_interop import resources
 
 _ONE_DAY_IN_SECONDS = 60 * 60 * 24
 

diff --git a/...python/interop/interop/credentials/README → ...pcio_test/grpc_interop/credentials/README b/...python/interop/interop/credentials/README → ...pcio_test/grpc_interop/credentials/README
diff --git a/...python/interop/interop/credentials/ca.pem → ...pcio_test/grpc_interop/credentials/ca.pem b/...python/interop/interop/credentials/ca.pem → ...pcio_test/grpc_interop/credentials/ca.pem
diff --git a/...n/interop/interop/credentials/server1.key → ...test/grpc_interop/credentials/server1.key b/...n/interop/interop/credentials/server1.key → ...test/grpc_interop/credentials/server1.key
diff --git a/...n/interop/interop/credentials/server1.pem → ...test/grpc_interop/credentials/server1.pem b/...n/interop/interop/credentials/server1.pem → ...test/grpc_interop/credentials/server1.pem
diff --git a/src/python/interop/interop/empty_pb2.py → ...hon/grpcio_test/grpc_interop/empty_pb2.py b/src/python/interop/interop/empty_pb2.py → ...hon/grpcio_test/grpc_interop/empty_pb2.py
diff --git a/src/python/interop/interop/messages_pb2.py → .../grpcio_test/grpc_interop/messages_pb2.py b/src/python/interop/interop/messages_pb2.py → .../grpcio_test/grpc_interop/messages_pb2.py
diff --git a/src/python/interop/interop/methods.py → ...ython/grpcio_test/grpc_interop/methods.py b/src/python/interop/interop/methods.py → ...ython/grpcio_test/grpc_interop/methods.py
@@ -38,8 +38,8 @@
 
 from grpc.framework.alpha import utilities
 
-from interop import empty_pb2
-from interop import messages_pb2
+from grpc_interop import empty_pb2
+from grpc_interop import messages_pb2
 
 _TIMEOUT = 7
 

diff --git a/src/python/interop/interop/resources.py → ...hon/grpcio_test/grpc_interop/resources.py b/src/python/interop/interop/resources.py → ...hon/grpcio_test/grpc_interop/resources.py
diff --git a/src/python/interop/interop/server.py → ...python/grpcio_test/grpc_interop/server.py b/src/python/interop/interop/server.py → ...python/grpcio_test/grpc_interop/server.py
@@ -35,8 +35,8 @@
 
 from grpc.early_adopter import implementations
 
-from interop import methods
-from interop import resources
+from grpc_interop import methods
+from grpc_interop import resources
 
 _ONE_DAY_IN_SECONDS = 60 * 60 * 24
 

diff --git a/src/python/interop/interop/test_pb2.py → ...thon/grpcio_test/grpc_interop/test_pb2.py b/src/python/interop/interop/test_pb2.py → ...thon/grpcio_test/grpc_interop/test_pb2.py
diff --git a/src/python/interop/setup.py → src/python/grpcio_test/setup.py b/src/python/interop/setup.py → src/python/grpcio_test/setup.py
@@ -31,24 +31,22 @@
 
 import setuptools
 
-_PACKAGES = (
-    'interop',
-)
+_PACKAGES = setuptools.find_packages('.')
 
 _PACKAGE_DIRECTORIES = {
-    'interop': 'interop',
+    '': '.',
 }
 
 _PACKAGE_DATA = {
-    'interop': [
+    'grpc_interop': [
         'credentials/ca.pem', 'credentials/server1.key',
         'credentials/server1.pem',]
 }
 
 _INSTALL_REQUIRES = ['oauth2client>=1.4.7', 'grpcio>=0.10.0a0']
 
 setuptools.setup(
-    name='interop',
+    name='grpcio_test',
     version='0.0.1',
     packages=_PACKAGES,
     package_dir=_PACKAGE_DIRECTORIES,

diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py
@@ -51,8 +51,8 @@
 PROJECT_ROOT = os.path.abspath(os.path.join(SCRIPT_DIR, '..', '..', '..'))
 
 CONFIG = args.config
-SETUP_PATH = os.path.join(PROJECT_ROOT, 'src/python/src/setup.py')
-DOC_PATH = os.path.join(PROJECT_ROOT, 'src/python/src/doc/build')
+SETUP_PATH = os.path.join(PROJECT_ROOT, 'src/python/grpcio/setup.py')
+DOC_PATH = os.path.join(PROJECT_ROOT, 'src/python/grpcio/doc/build')
 INCLUDE_PATH = os.path.join(PROJECT_ROOT, 'include')
 LIBRARY_PATH = os.path.join(PROJECT_ROOT, 'libs/{}'.format(CONFIG))
 VIRTUALENV_DIR = os.path.join(SCRIPT_DIR, 'distrib_virtualenv')

diff --git a/tools/distrib/python/submit.py b/tools/distrib/python/submit.py
@@ -59,7 +59,7 @@
 
 # Move to the root directory of Python GRPC.
 pkgdir = os.path.join(os.path.dirname(os.path.abspath(__file__)),
-                      '../../../src/python/src')
+                      '../../../src/python/grpcio')
 # Remove previous distributions; they somehow confuse twine.
 try:
   shutil.rmtree(os.path.join(pkgdir, 'dist/'))

diff --git a/tools/run_tests/build_python.sh b/tools/run_tests/build_python.sh
@@ -43,22 +43,22 @@ make_virtualenv() {
     virtualenv -p `which "python"$1` $virtualenv_name
     source $virtualenv_name/bin/activate
     pip install -r src/python/requirements.txt
-    CFLAGS="-I$root/include -std=c89" LDFLAGS=-L$root/libs/$CONFIG GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install src/python/src
-    pip install src/python/interop
+    CFLAGS="-I$root/include -std=c89" LDFLAGS=-L$root/libs/$CONFIG GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install src/python/grpcio
+    pip install src/python/grpcio_test
   else
     source $virtualenv_name/bin/activate
     # Uninstall and re-install the packages we care about. Don't use
     # --force-reinstall or --ignore-installed to avoid propagating this
     # unnecessarily to dependencies. Don't use --no-deps to avoid missing
     # dependency upgrades.
     (yes | pip uninstall grpcio) || true
-    (yes | pip uninstall interop) || true
-    (CFLAGS="-I$root/include -std=c89" LDFLAGS=-L$root/libs/$CONFIG GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install src/python/src) || (
+    (yes | pip uninstall grpcio_test) || true
+    (CFLAGS="-I$root/include -std=c89" LDFLAGS=-L$root/libs/$CONFIG GRPC_PYTHON_BUILD_WITH_CYTHON=1 pip install src/python/grpcio) || (
       # Fall back to rebuilding the entire environment
       rm -rf $virtualenv_name
       make_virtualenv $1
     )
-    pip install src/python/interop
+    pip install src/python/grpcio_test
   fi
 }
 

diff --git a/tools/run_tests/python_tests.json b/tools/run_tests/python_tests.json
@@ -102,13 +102,13 @@
     ]
   },
   {
-    "module": "interop._insecure_interop_test",
+    "module": "grpc_interop._insecure_interop_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "interop._secure_interop_test",
+    "module": "grpc_interop._secure_interop_test",
     "pythonVersions": [
       "2.7"
     ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ @@
     html_theme = 'sphinx_rtd_theme'
     """
     class SphinxDocumentation(setuptools.Command):
       """Command to generate documentation via sphinx."""
@@ Expand Down @@