From fc350849a3e3d2c1bbeaaaafbaa77fe2a558310b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Sat, 8 Dec 2018 12:43:40 +0100 Subject: [PATCH] Set fixed version for ipykernel --- scripts/pip_requirements.txt | 2 ++ scripts/prepare_python_linux.sh | 4 +++- scripts/prepare_python_macos.sh | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 scripts/pip_requirements.txt diff --git a/scripts/pip_requirements.txt b/scripts/pip_requirements.txt new file mode 100644 index 00000000..9a58fcd5 --- /dev/null +++ b/scripts/pip_requirements.txt @@ -0,0 +1,2 @@ +jupyter +ipykernel==4.10.0 diff --git a/scripts/prepare_python_linux.sh b/scripts/prepare_python_linux.sh index c1f33027..dfbb42fe 100755 --- a/scripts/prepare_python_linux.sh +++ b/scripts/prepare_python_linux.sh @@ -1,5 +1,7 @@ #!/bin/bash +SCRIPTPATH=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")") + mkdir -p python && cd python || exit 1 export CUSTOM_PYTHON_PREFIX="`pwd`/prefix" @@ -31,6 +33,6 @@ done PYTHONHOME=$CUSTOM_PYTHON_PREFIX \ LD_LIBRARY_PATH=$CUSTOM_PYTHON_PREFIX/lib \ - "$CUSTOM_PYTHON_PREFIX/bin/pip3" install jupyter || exit 1 + "$CUSTOM_PYTHON_PREFIX/bin/pip3" install -r "$SCRIPTPATH/pip_requirements.txt" || exit 1 cd .. diff --git a/scripts/prepare_python_macos.sh b/scripts/prepare_python_macos.sh index fb3cffbd..1172d453 100755 --- a/scripts/prepare_python_macos.sh +++ b/scripts/prepare_python_macos.sh @@ -1,5 +1,7 @@ #!/bin/bash +SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")") + mkdir python && cd python wget "https://www.python.org/ftp/python/3.6.4/Python-3.6.4.tar.xz" || exit 1 @@ -18,6 +20,6 @@ make -j4 || exit 1 make frameworkinstallframework > /dev/null || exit 1 PYTHONHOME=$PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current \ - $PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current/bin/pip3 install jupyter || exit 1 + $PYTHON_FRAMEWORK_DIR/Python.framework/Versions/Current/bin/pip3 install -r "$SCRIPTPATH/pip_requirements.txt" || exit 1 cd ../..