Merge pull request #2698 from soltanmm/reorganize-python

Reorganize src/python.

4 files changed, 27 insertions, 27 deletions

diff --git a/tools/distrib/python/docgen.py b/tools/distrib/python/docgen.py
index 3ab84a6ba1..d76792c56f 100755
--- a/tools/distrib/python/docgen.py
+++ b/tools/distrib/python/docgen.py
@@ -51,8 +51,8 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
 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
index a3615b3640..909ba56327 100755
--- a/tools/distrib/python/submit.py
+++ b/tools/distrib/python/submit.py
@@ -59,7 +59,7 @@ args = parser.parse_args()
 
 # 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
index ae0fb42241..265a542e3a 100755
--- a/tools/run_tests/build_python.sh
+++ b/tools/run_tests/build_python.sh
@@ -43,8 +43,8 @@ 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
@@ -52,13 +52,13 @@ make_virtualenv() {
     # 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
index 3d75d8de36..426b93fe3a 100755
--- a/tools/run_tests/python_tests.json
+++ b/tools/run_tests/python_tests.json
@@ -1,114 +1,114 @@
 [
   {
-    "module": "grpc._adapter._c_test",
+    "module": "grpc_test._adapter._c_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._low_test",
+    "module": "grpc_test._adapter._low_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._intermediary_low_test",
+    "module": "grpc_test._adapter._intermediary_low_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._links_test",
+    "module": "grpc_test._adapter._links_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._lonely_rear_link_test",
+    "module": "grpc_test._adapter._lonely_rear_link_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._blocking_invocation_inline_service_test",
+    "module": "grpc_test._adapter._blocking_invocation_inline_service_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._event_invocation_synchronous_event_service_test",
+    "module": "grpc_test._adapter._event_invocation_synchronous_event_service_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._adapter._future_invocation_asynchronous_event_service_test",
+    "module": "grpc_test._adapter._future_invocation_asynchronous_event_service_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._links._lonely_invocation_link_test",
+    "module": "grpc_test._links._lonely_invocation_link_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc._links._transmission_test",
+    "module": "grpc_test._links._transmission_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.early_adopter.implementations_test",
+    "module": "grpc_test.early_adopter.implementations_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.framework.base.implementations_test",
+    "module": "grpc_test.framework.base.implementations_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.framework.face.blocking_invocation_inline_service_test",
+    "module": "grpc_test.framework.face.blocking_invocation_inline_service_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.framework.face.event_invocation_synchronous_event_service_test",
+    "module": "grpc_test.framework.face.event_invocation_synchronous_event_service_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.framework.face.future_invocation_asynchronous_event_service_test",
+    "module": "grpc_test.framework.face.future_invocation_asynchronous_event_service_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.framework.foundation._later_test",
+    "module": "grpc_test.framework.foundation._later_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "module": "grpc.framework.foundation._logging_pool_test",
+    "module": "grpc_test.framework.foundation._logging_pool_test",
     "pythonVersions": [
       "2.7"
     ]
   },
   {
-    "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"
     ]