diff --git a/getting_started/getting_started.bat b/getting_started/getting_started.bat index d0da9b60fb810ea06a7dcf3fcca6aea828756f40..c536cc21103aa721dcda68066fe732e3bd81eed9 100644 --- a/getting_started/getting_started.bat +++ b/getting_started/getting_started.bat @@ -4,9 +4,9 @@ set FLATLAND_BASEDIR=%~dp0\.. cd %FLATLAND_BASEDIR% -conda install -c conda-forge tox-conda || goto :error -conda install tox || goto :error -tox -v -e start_jupyter --recreate || goto :error +call conda install -y -c conda-forge tox-conda || goto :error +call conda install -y tox || goto :error +call tox -v -e start_jupyter --recreate || goto :error goto :EOF diff --git a/getting_started/getting_started.sh b/getting_started/getting_started.sh index 3d5539c0895bc3ba78bcc7d7efcb4c2d51b0ff2b..0e63b083fae77b7c1a2f8599852e9f8719537976 100644 --- a/getting_started/getting_started.sh +++ b/getting_started/getting_started.sh @@ -8,6 +8,6 @@ FLATLAND_BASEDIR=$(dirname "$0")/.. FLATLAND_BASEDIR=$(realpath "$FLATLAND_BASEDIR") cd ${FLATLAND_BASEDIR} -conda install -c conda-forge tox-conda -conda install tox +conda install -y -c conda-forge tox-conda +conda install -y tox tox -v -e start_jupyter & diff --git a/tox.ini b/tox.ini index e34a1e496b5317b95f61ec2c52f060d2bb7498b5..80da9ccd9d646176b69826b3f2f44b2e6047c0b6 100644 --- a/tox.ini +++ b/tox.ini @@ -148,11 +148,10 @@ conda_channels : ; run tests from subfolder to ensure that resources are accessed via resources and not via relative paths changedir = {envtmpdir}/6f59bc68108c3895b1828abdd04b9a06 commands = -; run tests from subfolder to ensure that resources are accessed via resources and not via relative paths - sh -c 'jupyter nbextension install --py --sys-prefix widgetsnbextension' - sh -c 'jupyter nbextension enable --py --sys-prefix widgetsnbextension' - sh -c 'jupyter nbextension install --py --sys-prefix jpy_canvas' - sh -c 'jupyter nbextension enable --py --sys-prefix jpy_canvas' + jupyter nbextension install --py --sys-prefix widgetsnbextension + jupyter nbextension enable --py --sys-prefix widgetsnbextension + jupyter nbextension install --py --sys-prefix jpy_canvas + jupyter nbextension enable --py --sys-prefix jpy_canvas ; https://stackoverflow.com/questions/35545402/how-to-run-an-ipynb-jupyter-notebook-from-terminal/35545463 sh -c 'ls {toxinidir}/notebooks/*.ipynb | xargs -n 1 jupyter nbconvert --to python' sh -c 'ls {toxinidir}/notebooks/*.py | xargs -I{} -n 1 sh -c "echo -e \"\n====== Running {} ========\n\"; ipython {}"' @@ -178,7 +177,12 @@ conda_deps = conda_channels : conda-forge anaconda +changedir = {envtmpdir}/toxinidir commands = + jupyter nbextension install --py --sys-prefix widgetsnbextension + jupyter nbextension enable --py --sys-prefix widgetsnbextension + jupyter nbextension install --py --sys-prefix jpy_canvas + jupyter nbextension enable --py --sys-prefix jpy_canvas jupyter notebook [testenv]