From 04c56ffbf7ff9b1df6bb80243227d804f938b1f6 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 1 Nov 2022 10:59:35 +0300 Subject: [PATCH] fix unix lf in jupyter --- Tools/Jupyter-notebooks/init-nbextension.cmd | 14 +++--- Tools/Jupyter-notebooks/init-python-env.cmd | 46 ++++++++++---------- Tools/Jupyter-notebooks/start-python-env.cmd | 6 +-- Tools/Jupyter-notebooks/start.cmd | 4 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Tools/Jupyter-notebooks/init-nbextension.cmd b/Tools/Jupyter-notebooks/init-nbextension.cmd index 9c77902c..22c5f7e8 100644 --- a/Tools/Jupyter-notebooks/init-nbextension.cmd +++ b/Tools/Jupyter-notebooks/init-nbextension.cmd @@ -1,8 +1,8 @@ -init-python-env.cmd -pip uninstall jupyter-core -pip uninstall jupyter-contrib-core -pip install "..\..\Resources\PyPackages\jupyter_core-4.6.3-py2.py3-none-any.whl" -pip install "..\..\Resources\PyPackages\jupyter_contrib_core-0.3.3-py2.py3-none-any.whl" -jupyter contrib nbextension install --user -jupyter nbextension enable Hinterland +init-python-env.cmd +pip uninstall jupyter-core +pip uninstall jupyter-contrib-core +pip install "..\..\Resources\PyPackages\jupyter_core-4.6.3-py2.py3-none-any.whl" +pip install "..\..\Resources\PyPackages\jupyter_contrib_core-0.3.3-py2.py3-none-any.whl" +jupyter contrib nbextension install --user +jupyter nbextension enable Hinterland jupyter nbextension enable highlighter \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/init-python-env.cmd b/Tools/Jupyter-notebooks/init-python-env.cmd index 2485ebac..eafce106 100644 --- a/Tools/Jupyter-notebooks/init-python-env.cmd +++ b/Tools/Jupyter-notebooks/init-python-env.cmd @@ -1,24 +1,24 @@ -chcp 65001 -@echo off -echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] -echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe - -if [%1]==[] goto :python-env -goto create-exe -:create-exe -copy /Y "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe" "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\%1" -if [%2]==[] goto :python-env -goto taskkill -:taskkill -taskkill /im "%2" /F /fi "username eq %username%" -goto :python-env -:python-env -set CD_PREV=%cd% -cd /d "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64" -set PATH=%cd%;%cd%\Scripts;%PATH% -cd /d "%~dp0..\..\Sources" -set PYTHONPATH=%cd%;%PYTHONPATH% -cd %CD_PREV% -:eof -echo Инициализация Python окружения прошла успешно! +chcp 65001 +@echo off +echo Формат использования init-python-env.cmd [имя запускаемого процесса.exe] [имя убиваемого процесса.exe] +echo Пример использования init-python-env.cmd orpa-rbt.exe orpa-rbt.exe + +if [%1]==[] goto :python-env +goto create-exe +:create-exe +copy /Y "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\python.exe" "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64\%1" +if [%2]==[] goto :python-env +goto taskkill +:taskkill +taskkill /im "%2" /F /fi "username eq %username%" +goto :python-env +:python-env +set CD_PREV=%cd% +cd /d "%~dp0..\..\Resources\WPy64-3720\python-3.7.2.amd64" +set PATH=%cd%;%cd%\Scripts;%PATH% +cd /d "%~dp0..\..\Sources" +set PYTHONPATH=%cd%;%PYTHONPATH% +cd %CD_PREV% +:eof +echo Инициализация Python окружения прошла успешно! @echo on \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/start-python-env.cmd b/Tools/Jupyter-notebooks/start-python-env.cmd index 652bdcbf..aed7bc5b 100644 --- a/Tools/Jupyter-notebooks/start-python-env.cmd +++ b/Tools/Jupyter-notebooks/start-python-env.cmd @@ -1,4 +1,4 @@ -chcp 65001 -cd /d "%~dp0" -call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe +chcp 65001 +cd /d "%~dp0" +call init-python-env.cmd orpa-rbt.exe orpa-rbt.exe cmd \ No newline at end of file diff --git a/Tools/Jupyter-notebooks/start.cmd b/Tools/Jupyter-notebooks/start.cmd index 8e6ecb2e..6f9fbd43 100755 --- a/Tools/Jupyter-notebooks/start.cmd +++ b/Tools/Jupyter-notebooks/start.cmd @@ -1,3 +1,3 @@ -chcp 65001 -call init-python-env.cmd jupyter-notebook.exe jupyter-notebook.exe +chcp 65001 +call init-python-env.cmd jupyter-notebook.exe jupyter-notebook.exe jupyter-notebook.exe -m notebook --notebook-dir=%~dp0 \ No newline at end of file