Rename datascience to datascience_modules (#10525) (#10528)

* Rename datascience to datascience_modules (#10525)

* Rename datascience to datascience_modules

* Change name to something even harder to get wrong

* Fix unit test failure for release

Author: rchiodo

pythonFiles/tests/ipython/scripts.py

@@ -46,7 +46,7 @@ def execute_script(file, replace_dict=dict([])):
 def get_variables(capsys):
     path = os.path.dirname(os.path.abspath(__file__))
     file = os.path.abspath(
-        os.path.join(path, "../../datascience/getJupyterVariableList.py")
+        os.path.join(path, "../../vscode_datascience_helpers/getJupyterVariableList.py")
     )
     if execute_script(file):
         read_out = capsys.readouterr()
@@ -65,7 +65,9 @@ def get_variable_value(variables, name, capsys):
     varJson = find_variable_json(variables, name)
     path = os.path.dirname(os.path.abspath(__file__))
     file = os.path.abspath(
-        os.path.join(path, "../../datascience/getJupyterVariableValue.py")
+        os.path.join(
+            path, "../../vscode_datascience_helpers/getJupyterVariableValue.py"
+        )
     )
     keys = dict([("_VSCode_JupyterTestValue", json.dumps(varJson))])
     if execute_script(file, keys):
@@ -79,7 +81,9 @@ def get_data_frame_info(variables, name, capsys):
     varJson = find_variable_json(variables, name)
     path = os.path.dirname(os.path.abspath(__file__))
     file = os.path.abspath(
-        os.path.join(path, "../../datascience/getJupyterVariableDataFrameInfo.py")
+        os.path.join(
+            path, "../../vscode_datascience_helpers/getJupyterVariableDataFrameInfo.py"
+        )
     )
     keys = dict([("_VSCode_JupyterTestValue", json.dumps(varJson))])
     if execute_script(file, keys):
@@ -92,7 +96,9 @@ def get_data_frame_info(variables, name, capsys):
 def get_data_frame_rows(varJson, start, end, capsys):
     path = os.path.dirname(os.path.abspath(__file__))
     file = os.path.abspath(
-        os.path.join(path, "../../datascience/getJupyterVariableDataFrameRows.py")
+        os.path.join(
+            path, "../../vscode_datascience_helpers/getJupyterVariableDataFrameRows.py"
+        )
     )
     keys = dict(
         [

pythonFiles/datascience/__init__.py …s/vscode_datascience_helpers/__init__.pypythonFiles/datascience/__init__.py renamed to pythonFiles/vscode_datascience_helpers/__init__.py pythonFiles/datascience/__init__.py renamed to pythonFiles/vscode_datascience_helpers/__init__.py

@@ -7,7 +7,7 @@ const env = {
     PYTHONUNBUFFERED: '1',
     PYTHONPATH: '<extension dir>/pythonFiles:<extension dir>/pythonFiles/lib/python'
 }
-const childProcess = cp.spawn('<fully qualifieid python path>', ['-m', 'datascience.daemon', '-v', '--log-file=log.log'], {env});
+const childProcess = cp.spawn('<fully qualifieid python path>', ['-m', 'vscode_datascience_helpers.daemon', '-v', '--log-file=log.log'], {env});
 const connection = rpc.createMessageConnection(new rpc.StreamMessageReader(childProcess.stdout),new rpc.StreamMessageWriter(childProcess.stdin));
 
 connection.onClose(() => console.error('Closed'));

pythonFiles/datascience/daemon/README.md …ode_datascience_helpers/daemon/README.mdpythonFiles/datascience/daemon/README.md renamed to pythonFiles/vscode_datascience_helpers/daemon/README.md pythonFiles/datascience/daemon/README.md renamed to pythonFiles/vscode_datascience_helpers/daemon/README.md

@@ -20,7 +20,7 @@ def add_arguments(parser):
 
     parser.add_argument(
         "--daemon-module",
-        default="datascience.daemon.daemon_python",
+        default="vscode_datascience_helpers.daemon.daemon_python",
         help="Daemon Module",
     )
 

…thonFiles/datascience/daemon/__init__.py …e_datascience_helpers/daemon/__init__.pypythonFiles/datascience/daemon/__init__.py renamed to pythonFiles/vscode_datascience_helpers/daemon/__init__.py pythonFiles/datascience/daemon/__init__.py renamed to pythonFiles/vscode_datascience_helpers/daemon/__init__.py

@@ -8,7 +8,7 @@
 import traceback
 import runpy
 import importlib
-from datascience.daemon.daemon_output import (
+from vscode_datascience_helpers.daemon.daemon_output import (
     CustomWriter,
     IORedirector,
     get_io_buffers,
@@ -63,7 +63,7 @@ def _decorator(self, *args, **kwargs):
 
 class PythonDaemon(MethodDispatcher):
     """ Base Python Daemon with simple methods to check if a module exists, get version info and the like.
-    To add additional methods, please create a separate class based off this and pass in the arg `--daemon-module` to `datascience.daemon`.
+    To add additional methods, please create a separate class based off this and pass in the arg `--daemon-module` to `vscode_datascience_helpers.daemon`.
     """
 
     def __init__(self, rx, tx):

…thonFiles/datascience/daemon/__main__.py …e_datascience_helpers/daemon/__main__.pypythonFiles/datascience/daemon/__main__.py renamed to pythonFiles/vscode_datascience_helpers/daemon/__main__.py pythonFiles/datascience/daemon/__main__.py renamed to pythonFiles/vscode_datascience_helpers/daemon/__main__.py

@@ -1,28 +1,28 @@
-# This file can mimic juypter running. Useful for testing jupyter crash handling
-
-import sys
-import argparse
-import time
-
-
-def main():
-    print("hello from dummy jupyter")
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--version", type=bool, default=False, const=True, nargs="?")
-    parser.add_argument("notebook", type=bool, default=False, const=True, nargs="?")
-    parser.add_argument("--no-browser", type=bool, default=False, const=True, nargs="?")
-    parser.add_argument("--notebook-dir", default="")
-    parser.add_argument("--config", default="")
-    results = parser.parse_args()
-    if results.version:
-        print("1.1.dummy")
-    else:
-        print(
-            "http://localhost:8888/?token=012f08663a68e279fe0a5335e0b5dfe44759ddcccf0b3a56"
-        )
-        time.sleep(5)
-        raise Exception("Dummy is dead")
-
-
-if __name__ == "__main__":
-    main()
+# This file can mimic juypter running. Useful for testing jupyter crash handling
+
+import sys
+import argparse
+import time
+
+
+def main():
+    print("hello from dummy jupyter")
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--version", type=bool, default=False, const=True, nargs="?")
+    parser.add_argument("notebook", type=bool, default=False, const=True, nargs="?")
+    parser.add_argument("--no-browser", type=bool, default=False, const=True, nargs="?")
+    parser.add_argument("--notebook-dir", default="")
+    parser.add_argument("--config", default="")
+    results = parser.parse_args()
+    if results.version:
+        print("1.1.dummy")
+    else:
+        print(
+            "http://localhost:8888/?token=012f08663a68e279fe0a5335e0b5dfe44759ddcccf0b3a56"
+        )
+        time.sleep(5)
+        raise Exception("Dummy is dead")
+
+
+if __name__ == "__main__":
+    main()