Skip to content

Commit

Permalink
Mix PyPI dependencies with system packager ones for clarity
Browse files Browse the repository at this point in the history
Rearrange dependencies according to pure backends rather than having
a separate pip block with one line of one-for-all build dependencies
which are hard to figure out in their current form.
  • Loading branch information
pevogam committed Oct 2, 2020
1 parent 4cc124d commit 33ff004
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
17 changes: 9 additions & 8 deletions packaging/packager_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ apt-get update
apt-get -y install python3 python3-coverage
# python-imaging
apt-get -y install python3-pil
# pip dependencies (for dependencies not available as DEB)
apt-get -y install gcc libx11-dev libxtst-dev python3-dev libpng-dev python3-pip
# contour, template, feature, cascade, text matching
apt-get -y install python3-numpy
if [[ $distro_version == "xenial" ]]; then
Expand All @@ -20,18 +22,17 @@ else
fi
# text matching
apt-get -y install tesseract-ocr libtesseract-dev
# desktop control
apt-get -y install xdotool x11-apps imagemagick
apt-get -y install x11vnc

# pip dependencies (not available as DEB)
apt-get -y install gcc g++ pkg-config libx11-dev libxtst-dev python3-dev libpng-dev python3-pip
pip3 install autopy==4.0.0
apt-get -y install g++ pkg-config
pip3 install pytesseract==0.3.4 tesserocr==2.5.1
# deep learning
pip3 install torch==1.4.0 torchvision==0.5.0
# screen controlling
pip3 install autopy==4.0.0
pip3 install vncdotool==0.12.0
apt-get -y install xdotool x11-apps imagemagick
apt-get -y install x11vnc

# deb packaging
# deb packaging and installing of current guibot source
apt-get -y install dh-make dh-python debhelper python3-all devscripts
ROOT=""
NAME=$(sed -n 's/^Package:[ \t]*//p' "$ROOT/guibot/packaging/debian/control")
Expand Down
17 changes: 9 additions & 8 deletions packaging/packager_rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,23 @@ readonly distro_version="${VERSION:-30}"
dnf -y install python3 python3-coverage
# python-imaging
dnf -y install python3-pillow
# pip dependencies (for dependencies not available as RPM)
dnf -y install gcc libX11-devel libXtst-devel python3-devel libpng-devel python3-pip redhat-rpm-config
# contour, template, feature, cascade, text matching
dnf -y install python3-numpy python3-opencv
# text matching
dnf -y install tesseract tesseract-devel
# desktop control
dnf -y install xdotool xwd ImageMagick
dnf -y install x11vnc

# pip dependencies (not available as RPM)
dnf -y install gcc gcc-c++ libX11-devel libXtst-devel python3-devel libpng-devel python3-pip redhat-rpm-config
pip3 install autopy==4.0.0
dnf -y install gcc-c++
pip3 install pytesseract==0.3.4 tesserocr==2.5.1
# deep learning
pip3 install torch==1.4.0 torchvision==0.5.0
# screen controlling
pip3 install autopy==4.0.0
pip3 install vncdotool==0.12.0
dnf -y install xdotool xwd ImageMagick
dnf -y install x11vnc

# rpm packaging
# rpm packaging and installing of current guibot source
dnf -y install rpm-build
ROOT=""
NAME=$(sed -n 's/^Name:[ \t]*//p' "$ROOT/guibot/packaging/guibot.spec")
Expand Down

0 comments on commit 33ff004

Please sign in to comment.