diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..dfdb8b77 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.sh text eol=lf diff --git a/docker/ces_container/Dockerfile b/docker/ces_container/Dockerfile index 768f3686..1d17c2fe 100644 --- a/docker/ces_container/Dockerfile +++ b/docker/ces_container/Dockerfile @@ -17,7 +17,7 @@ COPY taskweaver/__init__.py /app/taskweaver/__init__.py COPY docker/ces_container/entrypoint.sh /app/entrypoint.sh RUN chmod +x /app/entrypoint.sh -ENV PYTHONPATH "${PYTHONPATH}:/app" +ENV PYTHONPATH="/app" ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/scripts/build_executor.ps1 b/scripts/build_executor.ps1 index 68631fa5..5ef6096c 100644 --- a/scripts/build_executor.ps1 +++ b/scripts/build_executor.ps1 @@ -1,7 +1,7 @@ $scriptDirectory = $PSScriptRoot Write-Host "The script directory is: $scriptDirectory" -$version = "0.2" +$version = "0.3" $imageName = "taskweavercontainers/taskweaver-executor" $imageFullName = "${imageName}:${version}" diff --git a/taskweaver/ces/kernel/launcher.py b/taskweaver/ces/kernel/launcher.py index 6d516a8d..759129a9 100644 --- a/taskweaver/ces/kernel/launcher.py +++ b/taskweaver/ces/kernel/launcher.py @@ -1,7 +1,6 @@ import os import sys -from taskweaver.ces.kernel.ext import TaskWeaverZMQShellDisplayHook from taskweaver.ces.kernel.kernel_logging import logger kernel_mode = os.getenv("TASKWEAVER_KERNEL_MODE", "local") @@ -56,6 +55,8 @@ def start_app(): from ipykernel.kernelapp import IPKernelApp from ipykernel.zmqshell import ZMQInteractiveShell + from taskweaver.ces.kernel.ext import TaskWeaverZMQShellDisplayHook + # override displayhook_class for skipping output suppress token issue ZMQInteractiveShell.displayhook_class = TaskWeaverZMQShellDisplayHook @@ -82,6 +83,11 @@ def start_app(): if __name__ == "__main__": if sys.path[0] == "": del sys.path[0] + import site + + user_site_packages = site.getusersitepackages() + if user_site_packages not in sys.path: + sys.path.append(site.getusersitepackages()) logger.info("Starting process...") logger.info("sys.path: %s", sys.path) logger.info("os.getcwd(): %s", os.getcwd())