From b406a846de30efb2326605b3641a945fcb444b83 Mon Sep 17 00:00:00 2001 From: Yury Yakhno Date: Thu, 10 Sep 2020 14:03:14 +0300 Subject: [PATCH] Correct packages and build procedure for modern environment --- install-opencv.sh | 8 +------- requirements.txt | 6 +++++- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/install-opencv.sh b/install-opencv.sh index 509c1f6..2ba0f99 100755 --- a/install-opencv.sh +++ b/install-opencv.sh @@ -98,24 +98,18 @@ function install_opencv() fi else echo "Installing opencv python for non-Raspbian"; - # check if pip2 & pip3 are available on the system via 'command' + # check if pip3 are available on the system via 'command' RC=0 command -v pip3 > /dev/null || RC=$? if [ $RC -ne 0 ] ; then exec_and_search_errors "$SUDO_PREFIX apt-get $APT_QUIET update -y" exec_and_search_errors "$SUDO_PREFIX apt-get $APT_QUIET install -y python3-pip" fi - command -v pip2 > /dev/null || RC=$? - if [ $RC -ne 0 ] ; then - exec_and_search_errors "$SUDO_PREFIX apt-get $APT_QUIET install -y python-pip" - fi PIP_QUIET=--quiet [ "${VERBOSE}" = "yes" ] && PIP_QUIET="" exec_and_search_errors "$PIP_PREFIX pip3 install $PIP_QUIET opencv-python>=3.4.0.12" exec_and_search_errors "$PIP_PREFIX pip3 install $PIP_QUIET opencv-contrib-python>=3.4.0.12" - exec_and_search_errors "$PIP_PREFIX pip2 install $PIP_QUIET opencv-python>=3.4.0.12" - exec_and_search_errors "$PIP_PREFIX pip2 install $PIP_QUIET opencv-contrib-python>=3.4.0.12" fi } diff --git a/requirements.txt b/requirements.txt index 2d024a2..cc7e1b2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,6 +12,10 @@ scikit-image>=0.13.0,<=0.14.0 scipy>=0.14.1,<=0.19.1 six>=1.10.0 networkx>=2.1,<=2.1 -pygraphviz>=1.3.1 +pygraphviz>=1.3.1,<=1.5 +# https://github.com/evilsocket/opensnitch/issues/275 +grpcio==1.24.0 Enum34>=1.1.6 numpy==1.15 +dask==2.4.0 +scikit-build==0.11.1