Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Container quickfix #38

Open
wants to merge 1 commit into
base: ncsdk2
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 1 addition & 7 deletions install-opencv.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
6 changes: 5 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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